diff options
| author | jem-odoo <jem@openerp.com> | 2018-12-06 15:15:57 +0000 |
|---|---|---|
| committer | jem-odoo <jem@openerp.com> | 2019-01-17 13:47:27 +0000 |
| commit | d2b3c9a04b4236c915541cc708a79500ec0c97c0 (patch) | |
| tree | e5811cc2b7f9c163527df4ece58c710a38ed72c3 /addons/mail/static/src/xml/activity.xml | |
| parent | 295b47a4808d9a78bf993c4211ccb5f4eb498818 (diff) | |
[IMP] mail: upload a file to mark activity as done
This commit introduces the "upload file" activity type
category. For an activity of that time, uploading a file
will mark the activity as done (and maybe create the forced
next activities).
This activity type is seen as a shortcut to upload a file
with a reminder.
Task-1915004
closes odoo/odoo#29861
Diffstat (limited to 'addons/mail/static/src/xml/activity.xml')
| -rw-r--r-- | addons/mail/static/src/xml/activity.xml | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index d38afb5c799..dafad00b008 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -83,11 +83,24 @@ </div> </t> <t t-name="mail.activity_thread_message_tools"> - <div t-if="activity.can_write"> - <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]"> + <div t-if="activity.can_write" class="o_thread_message_tools btn-group"> + <span t-if="activity.activity_category !== 'upload_file'" 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> + <span t-if="activity.activity_category === 'upload_file'" class="o_mark_as_done_upload_file" 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]" t-att-data-fileupload-id="activity.fileuploadID"> + <a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_link mr8"> + <i class="fa fa-upload"/> Upload Document </a> + </span> + <span t-if="activity.activity_category === 'upload_file'" class="d-none"> + <t t-call="HiddenInputFile"> + <t t-set="fileupload_id" t-value="activity.fileuploadID"/> + <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t> + <input type="hidden" name="model" t-att-value="activity.res_model"/> + <input type="hidden" name="id" t-att-value="activity.res_id"/> + <input type="hidden" name="session_id" t-att-value="session.session_id"/> + </t> + </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> |