From add436681845db4cf46d78871e710dbe2a5680df Mon Sep 17 00:00:00 2001 From: manu Date: Fri, 13 Aug 2021 12:53:43 +0200 Subject: [PATCH] [MIG]mail_activity_done: Migration to 14.0 --- mail_activity_done/LICENSE | 2 +- mail_activity_done/README.rst | 17 +-- mail_activity_done/__manifest__.py | 16 +-- mail_activity_done/hooks.py | 68 ++++++++--- mail_activity_done/i18n/hu.po | 109 ++++++++++++++++++ .../i18n/mail_activity_done.pot | 60 ++++++---- .../migrations/12.0.2.0.0/post-migration.py | 14 --- mail_activity_done/models/mail_activity.py | 52 +++++++-- mail_activity_done/models/res_users.py | 8 +- mail_activity_done/readme/CONTRIBUTORS.rst | 5 +- .../static/description/index.html | 13 ++- .../static/src/js/mail_activity.js | 28 ++--- .../views/mail_activity_views.xml | 4 +- mail_activity_done/views/templates.xml | 2 +- 14 files changed, 295 insertions(+), 103 deletions(-) create mode 100644 mail_activity_done/i18n/hu.po delete mode 100644 mail_activity_done/migrations/12.0.2.0.0/post-migration.py diff --git a/mail_activity_done/LICENSE b/mail_activity_done/LICENSE index 12334e0..7a9e777 100644 --- a/mail_activity_done/LICENSE +++ b/mail_activity_done/LICENSE @@ -856,4 +856,4 @@ Public License instead of this License. But first, please read . -************************************************************************** \ No newline at end of file +************************************************************************** diff --git a/mail_activity_done/README.rst b/mail_activity_done/README.rst index 390a0dc..49e4854 100644 --- a/mail_activity_done/README.rst +++ b/mail_activity_done/README.rst @@ -14,13 +14,13 @@ Mail Activity Done :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github - :target: https://github.com/OCA/social/tree/12.0/mail_activity_done + :target: https://github.com/OCA/social/tree/14.0/mail_activity_done :alt: OCA/social .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_activity_done + :target: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_activity_done :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/205/12.0 + :target: https://runbot.odoo-community.org/runbot/205/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -41,7 +41,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -51,12 +51,15 @@ Credits Authors ~~~~~~~ -* Eficent +* ForgeFlow Contributors ~~~~~~~~~~~~ -* Jordi Ballester (www.eficent.com) +* Jordi Ballester (www.forgeflow.com) +* Eduardo Magdalena (C2i Change 2 improve http://www.c2i.es) +* Radovan Skolnik (https://www.kema.sk) +* Manuel Regidor (https://www.sygel.es) Maintainers ~~~~~~~~~~~ @@ -71,6 +74,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/social `_ project on GitHub. +This module is part of the `OCA/social `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_activity_done/__manifest__.py b/mail_activity_done/__manifest__.py index ea769cf..c966111 100644 --- a/mail_activity_done/__manifest__.py +++ b/mail_activity_done/__manifest__.py @@ -1,18 +1,14 @@ -# Copyright 2018 Eficent +# Copyright 2018-20 ForgeFlow # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { "name": "Mail Activity Done", - "version": "12.0.2.0.0", - "author": "Eficent," "Odoo Community Association (OCA)", + "version": "14.0.1.0.1", + "author": "ForgeFlow, Odoo Community Association (OCA)", "license": "LGPL-3", "category": "Discuss", - "depends": [ - "mail", - ], - "data": [ - "views/templates.xml", - "views/mail_activity_views.xml", - ], + "website": "https://github.com/OCA/social", + "depends": ["mail"], + "data": ["views/templates.xml", "views/mail_activity_views.xml"], "pre_init_hook": "pre_init_hook", "post_load": "post_load_hook", "uninstall_hook": "uninstall_hook", diff --git a/mail_activity_done/hooks.py b/mail_activity_done/hooks.py index ec70e26..8074ba8 100644 --- a/mail_activity_done/hooks.py +++ b/mail_activity_done/hooks.py @@ -1,4 +1,4 @@ -# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# Copyright 2018-20 ForgeFlow # Copyright 2018 Odoo, S.A. # License AGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from odoo import fields @@ -32,30 +32,70 @@ def pre_init_hook(cr): def post_load_hook(): - def new_action_feedback(self, feedback=False): - + def _new_action_done(self, feedback=False, attachment_ids=None): + """Overwritten method""" if "done" not in self._fields: - return self.action_feedback_original(feedback=feedback) - message = self.env["mail.message"] - if feedback: - self.write(dict(feedback=feedback)) + return self._action_done_original( + feedback=feedback, attachment_ids=attachment_ids + ) + # marking as 'done' + messages = self.env["mail.message"] + next_activities_values = [] for activity in self: + # extract value to generate next activities + if activity.force_next: + # context key is required in the onchange to set deadline + Activity = self.env["mail.activity"].with_context( + activity_previous_deadline=activity.date_deadline + ) + vals = Activity.default_get(Activity.fields_get()) + + vals.update( + { + "previous_activity_type_id": activity.activity_type_id.id, + "res_id": activity.res_id, + "res_model": activity.res_model, + "res_model_id": self.env["ir.model"] + ._get(activity.res_model) + .id, + } + ) + virtual_activity = Activity.new(vals) + virtual_activity._onchange_previous_activity_type_id() + virtual_activity._onchange_activity_type_id() + next_activities_values.append( + virtual_activity._convert_to_write(virtual_activity._cache) + ) + + # post message on activity, before deleting it record = self.env[activity.res_model].browse(activity.res_id) activity.done = True activity.active = False activity.date_done = fields.Date.today() record.message_post_with_view( "mail.message_activity_done", - values={"activity": activity}, - subtype_id=self.env.ref("mail.mt_activities").id, + values={ + "activity": activity, + "feedback": feedback, + "display_assignee": activity.user_id != self.env.user, + }, + subtype_id=self.env["ir.model.data"].xmlid_to_res_id( + "mail.mt_activities" + ), mail_activity_type_id=activity.activity_type_id.id, + attachment_ids=[(4, attachment_id) for attachment_id in attachment_ids] + if attachment_ids + else [], ) - message |= record.message_ids[0] - return message.ids and message.ids[0] or False + messages |= record.message_ids[0] - if not hasattr(MailActivity, "action_feedback_original"): - MailActivity.action_feedback_original = MailActivity.action_feedback - MailActivity.action_feedback = new_action_feedback + next_activities = self.env["mail.activity"].create(next_activities_values) + + return messages, next_activities + + if not hasattr(MailActivity, "_action_done_original"): + MailActivity._action_done_original = MailActivity._action_done + MailActivity._action_done = _new_action_done def uninstall_hook(cr, registry): diff --git a/mail_activity_done/i18n/hu.po b/mail_activity_done/i18n/hu.po new file mode 100644 index 0000000..9c28b0d --- /dev/null +++ b/mail_activity_done/i18n/hu.po @@ -0,0 +1,109 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_activity_done +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2021-04-16 14:36+0000\n" +"Last-Translator: Tamás Dombos \n" +"Language-Team: none\n" +"Language: hu\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" + +#. module: mail_activity_done +#. openerp-web +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 +#, python-format +msgid "%d days overdue" +msgstr "%d nap késésben" + +#. module: mail_activity_done +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity__active +msgid "Active" +msgstr "Aktív" + +#. module: mail_activity_done +#: model:ir.model.fields,field_description:mail_activity_done.field_event_event__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_event_registration__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity_mixin__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_mailing_mailing__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_res_partner__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_res_users__activity_ids +msgid "Activities" +msgstr "Tevékenységek" + +#. module: mail_activity_done +#: model:ir.model,name:mail_activity_done.model_mail_activity +msgid "Activity" +msgstr "Tevékenység" + +#. module: mail_activity_done +#: model:ir.model,name:mail_activity_done.model_mail_activity_mixin +msgid "Activity Mixin" +msgstr "Tevékenység mixin" + +#. module: mail_activity_done +#: model_terms:ir.ui.view,arch_db:mail_activity_done.mail_activity_view_search +#: model_terms:ir.ui.view,arch_db:mail_activity_done.res_partner_view_search_inherit_mail +msgid "Completed Activities" +msgstr "Elkészült tevékenységek" + +#. module: mail_activity_done +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity__date_done +msgid "Completed Date" +msgstr "Elkészülés dátuma" + +#. module: mail_activity_done +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity__done +#: model:ir.model.fields.selection,name:mail_activity_done.selection__mail_activity__state__done +msgid "Done" +msgstr "Kész" + +#. module: mail_activity_done +#. openerp-web +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 +#, python-format +msgid "Due in %d days" +msgstr "%d napon belül esedékes" + +#. module: mail_activity_done +#: model_terms:ir.ui.view,arch_db:mail_activity_done.res_partner_view_search_inherit_mail +msgid "Open Activities" +msgstr "Nyitott tevékenységek" + +#. module: mail_activity_done +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity__state +msgid "State" +msgstr "Állapot" + +#. module: mail_activity_done +#. openerp-web +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 +#, python-format +msgid "Today" +msgstr "Ma" + +#. module: mail_activity_done +#. openerp-web +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 +#, python-format +msgid "Tomorrow" +msgstr "Holnap" + +#. module: mail_activity_done +#: model:ir.model,name:mail_activity_done.model_res_users +msgid "Users" +msgstr "Felhasználók" + +#. module: mail_activity_done +#. openerp-web +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 +#, python-format +msgid "Yesterday" +msgstr "Tegnap" diff --git a/mail_activity_done/i18n/mail_activity_done.pot b/mail_activity_done/i18n/mail_activity_done.pot index 602332c..3135f55 100644 --- a/mail_activity_done/i18n/mail_activity_done.pot +++ b/mail_activity_done/i18n/mail_activity_done.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * mail_activity_done +# * mail_activity_done # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -15,7 +15,7 @@ msgstr "" #. module: mail_activity_done #. openerp-web -#: code:addons/mail_activity_done/static/src/js/mail_activity.js:31 +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 #, python-format msgid "%d days overdue" msgstr "" @@ -26,7 +26,16 @@ msgid "Active" msgstr "" #. module: mail_activity_done +#: model:ir.model.fields,field_description:mail_activity_done.field_account_bank_statement_line__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_account_journal__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_account_move__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_account_payment__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_event_event__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_event_registration__activity_ids #: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity_mixin__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_mailing_mailing__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_product_product__activity_ids +#: model:ir.model.fields,field_description:mail_activity_done.field_product_template__activity_ids #: model:ir.model.fields,field_description:mail_activity_done.field_res_partner__activity_ids #: model:ir.model.fields,field_description:mail_activity_done.field_res_users__activity_ids msgid "Activities" @@ -53,34 +62,45 @@ msgstr "" msgid "Completed Date" msgstr "" +#. module: mail_activity_done +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity__display_name +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity_mixin__display_name +#: model:ir.model.fields,field_description:mail_activity_done.field_res_users__display_name +msgid "Display Name" +msgstr "" + #. module: mail_activity_done #: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity__done -#: selection:mail.activity,state:0 +#: model:ir.model.fields.selection,name:mail_activity_done.selection__mail_activity__state__done msgid "Done" msgstr "" #. module: mail_activity_done #. openerp-web -#: code:addons/mail_activity_done/static/src/js/mail_activity.js:37 +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 #, python-format msgid "Due in %d days" msgstr "" +#. module: mail_activity_done +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity__id +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity_mixin__id +#: model:ir.model.fields,field_description:mail_activity_done.field_res_users__id +msgid "ID" +msgstr "" + +#. module: mail_activity_done +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity____last_update +#: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity_mixin____last_update +#: model:ir.model.fields,field_description:mail_activity_done.field_res_users____last_update +msgid "Last Modified on" +msgstr "" + #. module: mail_activity_done #: model_terms:ir.ui.view,arch_db:mail_activity_done.res_partner_view_search_inherit_mail msgid "Open Activities" msgstr "" -#. module: mail_activity_done -#: selection:mail.activity,state:0 -msgid "Overdue" -msgstr "" - -#. module: mail_activity_done -#: selection:mail.activity,state:0 -msgid "Planned" -msgstr "" - #. module: mail_activity_done #: model:ir.model.fields,field_description:mail_activity_done.field_mail_activity__state msgid "State" @@ -88,15 +108,14 @@ msgstr "" #. module: mail_activity_done #. openerp-web -#: code:addons/mail_activity_done/static/src/js/mail_activity.js:25 -#: selection:mail.activity,state:0 +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 #, python-format msgid "Today" msgstr "" #. module: mail_activity_done #. openerp-web -#: code:addons/mail_activity_done/static/src/js/mail_activity.js:35 +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 #, python-format msgid "Tomorrow" msgstr "" @@ -108,8 +127,7 @@ msgstr "" #. module: mail_activity_done #. openerp-web -#: code:addons/mail_activity_done/static/src/js/mail_activity.js:29 +#: code:addons/mail_activity_done/static/src/js/mail_activity.js:0 #, python-format msgid "Yesterday" msgstr "" - diff --git a/mail_activity_done/migrations/12.0.2.0.0/post-migration.py b/mail_activity_done/migrations/12.0.2.0.0/post-migration.py deleted file mode 100644 index 577584d..0000000 --- a/mail_activity_done/migrations/12.0.2.0.0/post-migration.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2019 Eficent -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - - -def migrate(cr, version): - if not version: - return - cr.execute( - """ - UPDATE mail_activity SET - active = False - WHERE done=True; - """ - ) diff --git a/mail_activity_done/models/mail_activity.py b/mail_activity_done/models/mail_activity.py index 39a7cb3..2a26997 100644 --- a/mail_activity_done/models/mail_activity.py +++ b/mail_activity_done/models/mail_activity.py @@ -1,4 +1,4 @@ -# Copyright 2018 Eficent +# Copyright 2018-20 ForgeFlow # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from odoo import api, fields, models @@ -9,19 +9,57 @@ class MailActivity(models.Model): active = fields.Boolean(default=True) done = fields.Boolean(default=False) - state = fields.Selection(selection_add=[("done", "Done")], compute="_compute_state") - date_done = fields.Date( - "Completed Date", - index=True, - readonly=True, + state = fields.Selection( + selection_add=[("done", "Done")], + compute="_compute_state", + search="_search_state", ) + date_done = fields.Date("Completed Date", index=True, readonly=True) @api.depends("date_deadline", "done") def _compute_state(self): - super(MailActivity, self)._compute_state() + super()._compute_state() for record in self.filtered(lambda activity: activity.done): record.state = "done" + def _search_state(self, operator, operand): + if not operand: + # checking for is (not) set + if operator == "=": + # is not set - never happens actually so we create impossible domain + return [("id", "=", False)] + else: + # is set - always - return empty domain + return [] + else: + # checking for value + if operand == "done": + if operator == "=": + return ["&", ("done", operator, True), ("active", "=", False)] + else: + return ["&", ("done", operator, False), ("active", "=", True)] + else: + if operator == "=": + return [ + "&", + ( + "date_deadline", + {"today": "=", "overdue": "<", "planned": ">"}[operand], + fields.Date.today(), + ), + ("done", "=", False), + ] + else: + return [ + "|", + ( + "date_deadline", + {"today": "!=", "overdue": ">=", "planned": "<="}[operand], + fields.Date.today(), + ), + ("done", "=", True), + ] + class MailActivityMixin(models.AbstractModel): diff --git a/mail_activity_done/models/res_users.py b/mail_activity_done/models/res_users.py index 1feeeee..97eea42 100644 --- a/mail_activity_done/models/res_users.py +++ b/mail_activity_done/models/res_users.py @@ -1,4 +1,4 @@ -# Copyright 2018 Eficent +# Copyright 2018-20 ForgeFlow # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from odoo import api, fields, models, modules @@ -26,11 +26,7 @@ class ResUsers(models.Model): GROUP BY m.id, states, act.res_model; """ self.env.cr.execute( - query, - { - "today": fields.Date.context_today(self), - "user_id": self.env.uid, - }, + query, {"today": fields.Date.context_today(self), "user_id": self.env.uid} ) activity_data = self.env.cr.dictfetchall() model_ids = [a["id"] for a in activity_data] diff --git a/mail_activity_done/readme/CONTRIBUTORS.rst b/mail_activity_done/readme/CONTRIBUTORS.rst index b41812d..1435a46 100644 --- a/mail_activity_done/readme/CONTRIBUTORS.rst +++ b/mail_activity_done/readme/CONTRIBUTORS.rst @@ -1 +1,4 @@ -* Jordi Ballester (www.eficent.com) +* Jordi Ballester (www.forgeflow.com) +* Eduardo Magdalena (C2i Change 2 improve http://www.c2i.es) +* Radovan Skolnik (https://www.kema.sk) +* Manuel Regidor (https://www.sygel.es) diff --git a/mail_activity_done/static/description/index.html b/mail_activity_done/static/description/index.html index eab04b0..32b461f 100644 --- a/mail_activity_done/static/description/index.html +++ b/mail_activity_done/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: LGPL-3 OCA/social Translate me on Weblate Try me on Runbot

+

Beta License: LGPL-3 OCA/social Translate me on Weblate Try me on Runbot

This module implements the capability to keep activities that have been completed, for future reporting, by setting them with the boolean ‘Done’.

The activities that have been completed will not appear in the chatter.

@@ -388,7 +388,7 @@ completed, for future reporting, by setting them with the boolean ‘Done’.

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -396,13 +396,16 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Authors

    -
  • Eficent
    • +
  • ForgeFlow

Contributors

@@ -412,7 +415,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/social project on GitHub.

+

This module is part of the OCA/social project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/mail_activity_done/static/src/js/mail_activity.js b/mail_activity_done/static/src/js/mail_activity.js index f739e93..13bd0b1 100644 --- a/mail_activity_done/static/src/js/mail_activity.js +++ b/mail_activity_done/static/src/js/mail_activity.js @@ -1,4 +1,4 @@ -// Copyright2018 Eficent +// Copyright 2018-20 ForgeFlow // License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). odoo.define("mail.Activity.done", function (require) { @@ -6,7 +6,6 @@ odoo.define("mail.Activity.done", function (require) { var mailUtils = require("mail.utils"); var core = require("web.core"); - var utils = require("mail.utils"); var time = require("web.time"); var mail_activity = require("mail.Activity"); @@ -20,23 +19,24 @@ odoo.define("mail.Activity.done", function (require) { _.each(activities, function (activity) { var to_display = ""; var deadline = moment(activity.date_deadline).startOf("day"); - var diff = deadline.diff(today, "days", true); // True means no rounding + // On next line, true means no rounding + var diff = deadline.diff(today, "days", true); if (diff === 0) { to_display = _t("Today"); } else if (diff < 0) { - // Overdue + // This block is for overdue + // eslint-disable-line no-lonely-if if (diff === -1) { to_display = _t("Yesterday"); } else { to_display = _.str.sprintf(_t("%d days overdue"), Math.abs(diff)); } + // This block is for due + } else if (diff === 1) { + // eslint-disable-line no-lonely-if + to_display = _t("Tomorrow"); } else { - // Due - if (diff === 1) { - to_display = _t("Tomorrow"); - } else { - to_display = _.str.sprintf(_t("Due in %d days"), Math.abs(diff)); - } + to_display = _.str.sprintf(_t("Due in %d days"), Math.abs(diff)); } activity.label_delay = to_display; }); @@ -47,7 +47,7 @@ odoo.define("mail.Activity.done", function (require) { return open_activities; }; - var Activity = mail_activity.include({ + mail_activity.include({ /** * @override * @private @@ -59,13 +59,13 @@ odoo.define("mail.Activity.done", function (require) { mailUtils.inline ); var is_blank = /^\s*$/.test(note); - if (!is_blank) { + if (is_blank) { + activity.note = ""; + } else { activity.note = mailUtils.parseAndTransform( activity.note, mailUtils.addLink ); - } else { - activity.note = ""; } }); var activities = setDelayLabel(this._activities); diff --git a/mail_activity_done/views/mail_activity_views.xml b/mail_activity_done/views/mail_activity_views.xml index 8f96f88..4b029d6 100644 --- a/mail_activity_done/views/mail_activity_views.xml +++ b/mail_activity_done/views/mail_activity_views.xml @@ -1,7 +1,7 @@ @@ -59,7 +59,7 @@ res.partner - +