[FIX] website_slides: remove no more useful old activity overrides
task-2429670 closes odoo/odoo#64341 Related: odoo/enterprise#15674 Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
This commit is contained in:
Xavier Dubuc
@@ -61,7 +61,7 @@ Featuring
|
||||
'data/slide_user_demo.xml',
|
||||
],
|
||||
'qweb': [
|
||||
'static/src/xml/activity.xml',
|
||||
'static/src/components/activity/activity.xml',
|
||||
],
|
||||
'installable': True,
|
||||
'application': True,
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
odoo.define('website_slides/static/src/components/activity/activity.js', function (require) {
|
||||
'use strict';
|
||||
|
||||
const components = {
|
||||
Activity: require('mail/static/src/components/activity/activity.js'),
|
||||
};
|
||||
const { patch } = require('web.utils');
|
||||
|
||||
patch(components.Activity, 'website_slides/static/src/components/activity/activity.js', {
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Handlers
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
async _onGrantAccess(ev) {
|
||||
await this.env.services.rpc({
|
||||
model: 'slide.channel',
|
||||
method: 'action_grant_access',
|
||||
args: [[this.activity.thread.id]],
|
||||
kwargs: { partner_id: this.activity.requestingPartner.id },
|
||||
});
|
||||
this.trigger('reload');
|
||||
},
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
async _onRefuseAccess(ev) {
|
||||
await this.env.services.rpc({
|
||||
model: 'slide.channel',
|
||||
method: 'action_refuse_access',
|
||||
args: [[this.activity.thread.id]],
|
||||
kwargs: { partner_id: this.activity.requestingPartner.id },
|
||||
});
|
||||
this.trigger('reload');
|
||||
},
|
||||
});
|
||||
|
||||
});
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<templates xml:space="preserve">
|
||||
<t t-inherit="mail.Activity" t-inherit-mode="extension">
|
||||
<xpath expr="//*[@name='tools']" position="replace">
|
||||
<t t-if="activity.requestingPartner and activity.thread.model === 'slide.channel'">
|
||||
<div class="o_Activity_tools">
|
||||
<button class="o_Activity_toolButton o_Activity_grantAccessButton btn btn-link" t-on-click="_onGrantAccess">
|
||||
<i class="fa fa-check"/> Grant Access
|
||||
</button>
|
||||
<button class="o_Activity_toolButton o_Activity_refuseAccessButton btn btn-link" t-on-click="_onRefuseAccess">
|
||||
<i class="fa fa-times"/> Refuse Access
|
||||
</button>
|
||||
</div>
|
||||
</t>
|
||||
<t t-else="">$0</t>
|
||||
</xpath>
|
||||
</t>
|
||||
</templates>
|
||||
@@ -1,87 +0,0 @@
|
||||
odoo.define('website_slides.Activity', function (require) {
|
||||
"use strict";
|
||||
|
||||
var field_registry = require('web.field_registry');
|
||||
|
||||
require('mail.Activity');
|
||||
|
||||
var KanbanActivity = field_registry.get('kanban_activity');
|
||||
|
||||
function applyInclude(Activity) {
|
||||
Activity.include({
|
||||
events: _.extend({}, Activity.prototype.events, {
|
||||
'click .o_activity_action_grant_access': '_onGrantAccess',
|
||||
'click .o_activity_action_refuse_access': '_onRefuseAccess',
|
||||
}),
|
||||
|
||||
_onGrantAccess: function (event) {
|
||||
var self = this;
|
||||
var partnerId = $(event.currentTarget).data('partner-id');
|
||||
this._rpc({
|
||||
model: 'slide.channel',
|
||||
method: 'action_grant_access',
|
||||
args: [this.res_id, partnerId],
|
||||
}).then(function (result) {
|
||||
self.trigger_up('reload');
|
||||
});
|
||||
},
|
||||
|
||||
_onRefuseAccess: function (event) {
|
||||
var self = this;
|
||||
var partnerId = $(event.currentTarget).data('partner-id');
|
||||
this._rpc({
|
||||
model: 'slide.channel',
|
||||
method: 'action_refuse_access',
|
||||
args: [this.res_id, partnerId],
|
||||
}).then(function () {
|
||||
self.trigger_up('reload');
|
||||
});
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
applyInclude(KanbanActivity);
|
||||
|
||||
});
|
||||
|
||||
odoo.define('website_slides/static/src/components/activity/activity.js', function (require) {
|
||||
'use strict';
|
||||
|
||||
const components = {
|
||||
Activity: require('mail/static/src/components/activity/activity.js'),
|
||||
};
|
||||
const { patch } = require('web.utils');
|
||||
|
||||
patch(components.Activity, 'website_slides/static/src/components/activity/activity.js', {
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Handlers
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
async _onGrantAccess(ev) {
|
||||
await this.env.services.rpc({
|
||||
model: 'slide.channel',
|
||||
method: 'action_grant_access',
|
||||
args: [[this.activity.thread.id]],
|
||||
kwargs: { partner_id: this.activity.requestingPartner.id },
|
||||
});
|
||||
this.trigger('reload');
|
||||
},
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
async _onRefuseAccess(ev) {
|
||||
await this.env.services.rpc({
|
||||
model: 'slide.channel',
|
||||
method: 'action_refuse_access',
|
||||
args: [[this.activity.thread.id]],
|
||||
kwargs: { partner_id: this.activity.requestingPartner.id },
|
||||
});
|
||||
this.trigger('reload');
|
||||
},
|
||||
});
|
||||
|
||||
});
|
||||
@@ -1,38 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<templates xml:space="preserve">
|
||||
<t t-extend="mail.activity_items">
|
||||
<t t-jquery=".o_thread_message .o_thread_message_core .o_thread_message_tools" t-operation="replace">
|
||||
<t t-if="activity.activity_type_id[1] == 'Access Request'">
|
||||
<t t-if="activity.user_id[0] === uid">
|
||||
<a role="button" class="btn btn-link btn-success text-muted text-success o_activity_link o_activity_action_grant_access" t-att-data-partner-id="activity.request_partner_id[0]">
|
||||
<i class="fa fa-check"/> Grant Access
|
||||
</a>
|
||||
<a role="button" class="btn btn-link btn-danger text-muted text-danger o_activity_link o_activity_action_refuse_access" t-att-data-partner-id="activity.request_partner_id[0]">
|
||||
<i class="fa fa-times"/> Refuse Access
|
||||
</a>
|
||||
</t>
|
||||
</t>
|
||||
<t t-else="">
|
||||
<div class="o_thread_message_tools btn-group">
|
||||
<t t-call="mail.activity_thread_message_tools"/>
|
||||
</div>
|
||||
</t>
|
||||
</t>
|
||||
</t>
|
||||
|
||||
<t t-inherit="mail.Activity" t-inherit-mode="extension">
|
||||
<xpath expr="//*[@name='tools']" position="replace">
|
||||
<t t-if="activity.requestingPartner and activity.thread.model === 'slide.channel'">
|
||||
<div class="o_Activity_tools">
|
||||
<button class="o_Activity_toolButton o_Activity_grantAccessButton btn btn-link" t-on-click="_onGrantAccess">
|
||||
<i class="fa fa-check"/> Grant Access
|
||||
</button>
|
||||
<button class="o_Activity_toolButton o_Activity_refuseAccessButton btn btn-link" t-on-click="_onRefuseAccess">
|
||||
<i class="fa fa-times"/> Refuse Access
|
||||
</button>
|
||||
</div>
|
||||
</t>
|
||||
<t t-else="">$0</t>
|
||||
</xpath>
|
||||
</t>
|
||||
</templates>
|
||||
@@ -5,9 +5,9 @@
|
||||
<xpath expr="." position="inside">
|
||||
<link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/rating_rating_views.scss"/>
|
||||
<link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/slide_views.scss"/>
|
||||
<script type="text/javascript" src="/website_slides/static/src/components/activity/activity.js"/>
|
||||
<script type="text/javascript" src="/website_slides/static/src/js/slide_category_one2many.js"/>
|
||||
<script type="text/javascript" src="/website_slides/static/src/js/rating_field_backend.js"/>
|
||||
<script type="text/javascript" src="/website_slides/static/src/js/activity.js"/>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user