[MERGE] mail, mass_mailing(_sms): split mail and sms marketing activities in systray
PURPOSE
mass_mailing and mass_mailing_sms activities are grouped as 1 item in the systray due to them using the same model name (sms inherits and distinguishes itself with a different field.Selection value). This is confusing behavior because they are 2 separate modules and the default icon ends up mismatching the sms-related activities.
SPECIFICATIONS
Split mass_mailing and mass_mailing_sms activities into 2 separate items in systray. Additionally, make it so when mass_mailing and mass_mailing_sms activities are clicked on, only the relevant activities are shown to prevent confusion. In order to only show relevant activities, an optional "domain" check is needed in __systray_activity_menu.js__ for when overriding _systray_get_activities_ methods provide a domain to apply.
Task: 2169498
PR #43272
Signed-off-by:
Thibault Delavallee (tde) <tde@openerp.com>
No related branches found
No related tags found
Showing
- addons/mail/static/src/js/systray/systray_activity_menu.js 13 additions, 2 deletionsaddons/mail/static/src/js/systray/systray_activity_menu.js
- addons/mail/static/src/xml/systray.xml 3 additions, 2 deletionsaddons/mail/static/src/xml/systray.xml
- addons/mass_mailing/models/__init__.py 1 addition, 0 deletionsaddons/mass_mailing/models/__init__.py
- addons/mass_mailing/models/res_users.py 21 additions, 0 deletionsaddons/mass_mailing/models/res_users.py
- addons/mass_mailing_sms/models/__init__.py 1 addition, 0 deletionsaddons/mass_mailing_sms/models/__init__.py
- addons/mass_mailing_sms/models/res_users.py 72 additions, 0 deletionsaddons/mass_mailing_sms/models/res_users.py
Loading
Please register or sign in to comment