diff options
| author | XavierDo <xdo@odoo.com> | 2018-09-13 13:15:32 +0200 |
|---|---|---|
| committer | XavierDo <xdo@odoo.com> | 2018-09-18 13:44:00 +0200 |
| commit | 47496b9fe5555ef23932fcfc3f2d6d6ee945daae (patch) | |
| tree | 691ab48e21c4489c92259b2bb58d7c126453e3f7 /addons/mail/static/src/xml/activity.xml | |
| parent | 44fd3bc8082205290e38de183d092b42c02c8215 (diff) | |
[IMP] mail: add force_next on activity type
A new field on activity type allow to change the behaviour of mark done & schedule next:
-marking as done will automatically schedule the next activity, based on the default_next_activity.
-It should also be impossible to edit an activity when this flag is on.
task: #1884521
Diffstat (limited to 'addons/mail/static/src/xml/activity.xml')
| -rw-r--r-- | addons/mail/static/src/xml/activity.xml | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index 2ddcea9121f..cb7f8a5ae28 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -75,9 +75,10 @@ </div> </t> <div class="o_thread_message_tools btn-group"> - <span class="o_mark_as_done" data-toggle="popover" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]"><a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_link mr8"> - <i class="fa fa-check"/> Mark Done - </a></span> + <span class="o_mark_as_done" data-toggle="popover" t-att-data-activity-id="activity.id" t-att-data-force-next-activity="activity.force_next" t-att-data-previous-activity-type-id="activity.activity_type_id[0]"> + <a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_link mr8"> + <i class="fa fa-check"/> Mark Done </a> + </span> <a role="button" href="#" class="btn btn-link btn-secondary text-muted o_edit_activity o_activity_link" t-att-data-activity-id="activity.id"> <i class="fa fa-pencil"/> Edit </a> @@ -94,12 +95,18 @@ <div> <textarea class="form-control" rows="3" id="activity_feedback" placeholder="Write Feedback"/> <div class="mt8"> - <button type="button" class="btn btn-sm btn-primary o_activity_popover_done_next" t-att-data-previous-activity-type-id="previous_activity_type_id"> - Done & Schedule Next</button> - <button type="button" class="btn btn-sm btn-primary o_activity_popover_done"> - Done</button> - <button type="button" class="btn btn-sm btn-link o_activity_popover_discard"> - Discard</button> + <t t-if="!force_next"> + <button type="button" class="btn btn-sm btn-primary o_activity_popover_done_next" t-att-data-previous-activity-type-id="previous_activity_type_id"> + Done & Schedule Next</button> + <button type="button" class="btn btn-sm btn-primary o_activity_popover_done"> + Done</button> + <button type="button" class="btn btn-sm btn-link o_activity_popover_discard"> + Discard</button> + </t> + <t t-else=""> + <button type="button" class="btn btn-sm btn-primary o_activity_popover_done_next"> + Done & Launch Next</button> + </t> </div> </div> </t> |