diff options
| author | Thibault Delavallée <tde@odoo.com> | 2018-05-25 11:02:33 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2018-05-25 11:02:33 +0200 |
| commit | d58c77b1ee7a4175366aeb067893876e73d63a2a (patch) | |
| tree | cd1438daddc39879469e14561d2a72c76bfcb327 | |
| parent | 58acf26ea43a6dfbd30c06b5e3c196305019e462 (diff) | |
| parent | 788feb953737348a2d40351db4869ae4a7c2950e (diff) | |
[MERGE] mail, calendar: improve daily use of activities through usability improvements
See subcommits for more details. Related to task ID 1838315. Closes #24513.
| -rw-r--r-- | addons/calendar/models/mail_activity.py | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/web_kanban_activity.xml | 2 | ||||
| -rw-r--r-- | addons/mail/views/mail_activity_views.xml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/addons/calendar/models/mail_activity.py b/addons/calendar/models/mail_activity.py index 3efcea70a3b..4cf142ed42d 100644 --- a/addons/calendar/models/mail_activity.py +++ b/addons/calendar/models/mail_activity.py @@ -23,7 +23,7 @@ class MailActivity(models.Model): 'default_activity_type_id': self.activity_type_id.id, 'default_res_id': self.env.context.get('default_res_id'), 'default_res_model': self.env.context.get('default_res_model'), - 'default_name': self.summary, + 'default_name': self.summary or self.res_name, 'default_description': self.note and tools.html2plaintext(self.note) or '', 'default_activity_ids': [(6, 0, self.ids)], } diff --git a/addons/mail/static/src/xml/web_kanban_activity.xml b/addons/mail/static/src/xml/web_kanban_activity.xml index 72ea47103c0..dff33f6465a 100644 --- a/addons/mail/static/src/xml/web_kanban_activity.xml +++ b/addons/mail/static/src/xml/web_kanban_activity.xml @@ -4,7 +4,7 @@ <t t-name="mail.KanbanActivity"> <div class="o_kanban_inline_block dropdown o_kanban_selection o_mail_activity"> <a class="dropdown-toggle o_activity_btn" data-toggle="dropdown"> - <span class="fa fa-clock-o fa-lg fa-fw"/> + <span class="fa fa-clock-o fa-lg fa-fw" t-att-title="widget.selection[widget.activity_state]"/> </a> <ul class="dropdown-menu o_activity" role="menu"> </ul> diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml index 1d09f8baedf..cc02fd80df3 100644 --- a/addons/mail/views/mail_activity_views.xml +++ b/addons/mail/views/mail_activity_views.xml @@ -24,7 +24,7 @@ <label for="days"/> <div> <field name="days" class="oe_inline"/> - <span class="oe_inline">days</span> + <span class="oe_inline ml4">days</span> </div> </group> <group> @@ -55,7 +55,7 @@ <field name="sequence" widget="handle"/> <field name="name"/> <field name="summary"/> - <field name="days"/> + <field name="days" string="Planned in (days)"/> <field name="res_model_id" groups="base.group_no_one"/> <field name="icon" groups="base.group_no_one"/> </tree> |