diff options
| author | Xavier Dubuc <xdu@odoo.com> | 2020-07-14 14:45:16 +0000 |
|---|---|---|
| committer | Xavier Dubuc <xdu@odoo.com> | 2020-07-16 15:53:29 +0000 |
| commit | 9ba8eb4a8338fe8255ee3dc721addbc5797b139d (patch) | |
| tree | b02beed6d9402c7ec7d59b83b1405f8f6a1ced31 /addons/mail/static/src | |
| parent | b9b228f1953d2989a68e272301530d3883eef20c (diff) | |
[FIX] mail: fix activity template (t-if placements)
odoo/enterprise#11836
task-2296875
closes odoo/odoo#54600
X-original-commit: 687628fa35063db5b44abcc758cae0a597df5ffe
Related: odoo/enterprise#11904
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/components/activity/activity.xml | 86 |
1 files changed, 45 insertions, 41 deletions
diff --git a/addons/mail/static/src/components/activity/activity.xml b/addons/mail/static/src/components/activity/activity.xml index 22f4f9dddc7..41d284b9dd6 100644 --- a/addons/mail/static/src/components/activity/activity.xml +++ b/addons/mail/static/src/components/activity/activity.xml @@ -52,50 +52,54 @@ </a> </div> - <div class="o_Activity_details" t-if="state.areDetailsVisible"> - <dl class="dl-horizontal"> - <t t-if="activity.type"> - <dt>Activity type</dt> - <dd class="o_Activity_type"> - <t t-esc="activity.type.displayName"/> - </dd> - </t> - <t t-if="activity.creator"> - <dt>Created</dt> - <dd class="o_Activity_detailsCreation"> - <t t-esc="formattedCreateDatetime"/> - <img class="o_Activity_detailsUserAvatar o_Activity_detailsCreatorAvatar" t-attf-src="/web/image/res.users/{{ activity.creator.id }}/image_128" t-att-title="activity.creator.nameOrDisplayName()" t-att-alt="activity.creator.nameOrDisplayName()"/> - <span class="o_Activity_detailsCreator"> - <t t-esc="activity.creator.nameOrDisplayName()"/> + <t t-if="state.areDetailsVisible"> + <div class="o_Activity_details"> + <dl class="dl-horizontal"> + <t t-if="activity.type"> + <dt>Activity type</dt> + <dd class="o_Activity_type"> + <t t-esc="activity.type.displayName"/> + </dd> + </t> + <t t-if="activity.creator"> + <dt>Created</dt> + <dd class="o_Activity_detailsCreation"> + <t t-esc="formattedCreateDatetime"/> + <img class="o_Activity_detailsUserAvatar o_Activity_detailsCreatorAvatar" t-attf-src="/web/image/res.users/{{ activity.creator.id }}/image_128" t-att-title="activity.creator.nameOrDisplayName()" t-att-alt="activity.creator.nameOrDisplayName()"/> + <span class="o_Activity_detailsCreator"> + <t t-esc="activity.creator.nameOrDisplayName()"/> + </span> + </dd> + </t> + <t t-if="activity.assignee"> + <dt>Assigned to</dt> + <dd class="o_Activity_detailsAssignation"> + <img class="o_Activity_detailsUserAvatar o_Activity_detailsAssignationUserAvatar" t-attf-src="/web/image/res.users/{{ activity.assignee.id }}/image_128" t-att-title="activity.assignee.nameOrDisplayName()" t-att-alt="activity.assignee.nameOrDisplayName()"/> + <t t-esc="activity.assignee.nameOrDisplayName()"/> + </dd> + </t> + <dt>Due on</dt> + <dd class="o_Activity_detailsDueDate"> + <span class="o_Activity_deadlineDateText" + t-att-class="{ + 'o-default': activity.state === 'default', + 'o-overdue': activity.state === 'overdue', + 'o-planned': activity.state === 'planned', + 'o-today': activity.state === 'today', + }" + > + <t t-esc="formattedDeadlineDate"/> </span> </dd> - </t> - <t t-if="activity.assignee"> - <dt>Assigned to</dt> - <dd class="o_Activity_detailsAssignation"> - <img class="o_Activity_detailsUserAvatar o_Activity_detailsAssignationUserAvatar" t-attf-src="/web/image/res.users/{{ activity.assignee.id }}/image_128" t-att-title="activity.assignee.nameOrDisplayName()" t-att-alt="activity.assignee.nameOrDisplayName()"/> - <t t-esc="activity.assignee.nameOrDisplayName()"/> - </dd> - </t> - <dt>Due on</dt> - <dd class="o_Activity_detailsDueDate"> - <span class="o_Activity_deadlineDateText" - t-att-class="{ - 'o-default': activity.state === 'default', - 'o-overdue': activity.state === 'overdue', - 'o-planned': activity.state === 'planned', - 'o-today': activity.state === 'today', - }" - > - <t t-esc="formattedDeadlineDate"/> - </span> - </dd> - </dl> - </div> + </dl> + </div> + </t> - <div class="o_Activity_note" t-if="activity.note"> - <t t-raw="activity.note"/> - </div> + <t t-if="activity.note"> + <div class="o_Activity_note"> + <t t-raw="activity.note"/> + </div> + </t> <t t-if="activity.mailTemplates.length > 0"> <div class="o_Activity_mailTemplates"> |