diff --git a/addons/mail/static/src/js/systray/systray_activity_menu.js b/addons/mail/static/src/js/systray/systray_activity_menu.js index 14a3ff7e513a4f7934c1ccda783ba3ecef3ccdc0..8edad417456e585ddeceda7b0202df9ace4b3b18 100644 --- a/addons/mail/static/src/js/systray/systray_activity_menu.js +++ b/addons/mail/static/src/js/systray/systray_activity_menu.js @@ -111,13 +111,18 @@ var ActivityMenu = Widget.extend({ if (actionXmlid) { this.do_action(actionXmlid); } else { + var domain = [['activity_ids.user_id', '=', session.uid]] + if (targetAction.data('domain')) { + domain = domain.concat(targetAction.data('domain')) + } + this.do_action({ type: 'ir.actions.act_window', name: targetAction.data('model_name'), views: [[false, 'activity'], [false, 'kanban'], [false, 'list']], view_mode: 'activity', res_model: targetAction.data('res_model'), - domain: [['activity_ids.user_id', '=', session.uid]], + domain: domain, }); } }, @@ -140,13 +145,19 @@ var ActivityMenu = Widget.extend({ // Necessary because activity_ids of mail.activity.mixin has auto_join // So, duplicates are faking the count and "Load more" doesn't show up context['force_search_count'] = 1; + + var domain = [['activity_ids.user_id', '=', session.uid]] + if (data.domain) { + domain = domain.concat(data.domain) + } + this.do_action({ type: 'ir.actions.act_window', name: data.model_name, res_model: data.res_model, views: [[false, 'kanban'], [false, 'list'], [false, 'form']], search_view_id: [false], - domain: [['activity_user_id', '=', session.uid]], + domain: domain, context:context, }); }, diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml index dc275079e28392c128ae36cc3d783600393a83cb..b10ef51a42982843b63645192e4f637059860b3c 100644 --- a/addons/mail/static/src/xml/systray.xml +++ b/addons/mail/static/src/xml/systray.xml @@ -71,7 +71,7 @@ </div> </t> <t t-foreach="activities" t-as="activity"> - <div class="o_mail_preview o_systray_activity" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='my'> + <div class="o_mail_preview o_systray_activity" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" t-att-data-domain="activity.domain" data-filter='my'> <div t-if="activity.icon" class="o_mail_preview_image o_mail_preview_app"> <img t-att-src="activity.icon" alt="Activity"/> </div> @@ -87,7 +87,8 @@ t-att-class="'o_mail_activity_action btn btn-link fa ' + action.icon" t-att-data-action_xmlid="action.action_xmlid" t-att-data-res_model="activity.model" - t-att-data-model_name="activity.name"> + t-att-data-model_name="activity.name" + t-att-data-domain="activity.domain"> </button> </t> </div>