diff options
| author | Martin Geubelle <mge@odoo.com> | 2018-10-17 14:05:37 +0000 |
|---|---|---|
| committer | Martin Geubelle <mge@odoo.com> | 2018-12-05 11:36:17 +0000 |
| commit | 4533ad07036b9de0ed13aa43cc8eba90527fcb5c (patch) | |
| tree | 579db216fc6edee76558351db4b3cae63fbb1fc3 /addons | |
| parent | f48021846a2b54d84d4317b40fa7128f76c28d10 (diff) | |
[FIX] mail: get systray activities for custom models
Getting systray activities for custom models (i.e. created with Studio) crashed.
If it's a custom model, its `_original_module` attribute is not correctly set so
trying to retrieve the icon based on this attribute does not work.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mail/models/res_users.py | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/systray.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/mail/models/res_users.py b/addons/mail/models/res_users.py index 0647d3f9e6e..9e04c6372e9 100644 --- a/addons/mail/models/res_users.py +++ b/addons/mail/models/res_users.py @@ -129,11 +129,13 @@ GROUP BY channel_moderator.res_users_id""", [tuple(self.ids)]) user_activities = {} for activity in activity_data: if not user_activities.get(activity['model']): + module = self.env[activity['model']]._original_module + icon = module and modules.module.get_module_icon(module) user_activities[activity['model']] = { 'name': model_names[activity['id']], 'model': activity['model'], 'type': 'activity', - 'icon': modules.module.get_module_icon(self.env[activity['model']]._original_module), + 'icon': icon, 'total_count': 0, 'today_count': 0, 'overdue_count': 0, 'planned_count': 0, } user_activities[activity['model']]['%s_count' % activity['states']] += activity['count'] diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml index 85c3598845c..db591b31c59 100644 --- a/addons/mail/static/src/xml/systray.xml +++ b/addons/mail/static/src/xml/systray.xml @@ -70,7 +70,7 @@ </t> <t t-foreach="activities" t-as="activity"> <div class="o_mail_preview" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='my'> - <div class="o_mail_preview_image o_mail_preview_app"> + <div t-if="activity.icon" class="o_mail_preview_image o_mail_preview_app"> <img t-att-src="activity.icon" alt="Activity"/> </div> <div class="o_preview_info"> |