diff --git a/mail_activity_team/README.rst b/mail_activity_team/README.rst index bfc24c846..d0501fc11 100644 --- a/mail_activity_team/README.rst +++ b/mail_activity_team/README.rst @@ -14,13 +14,13 @@ Mail Activity Team :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github - :target: https://github.com/OCA/social/tree/14.0/mail_activity_team + :target: https://github.com/OCA/social/tree/15.0/mail_activity_team :alt: OCA/social .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_activity_team + :target: https://translation.odoo-community.org/projects/social-15-0/social-15-0-mail_activity_team :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/14.0 + :target: https://runbot.odoo-community.org/runbot/205/15.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -58,13 +58,18 @@ You can report on the activities assigned to a team going to *Dashboards / Activities*, and then filter by a specific team or group by teams. +Known issues / Roadmap +====================== + +* In next version systray.esm.js file should be changed as added in comments. + 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. @@ -74,17 +79,18 @@ Credits Authors ~~~~~~~ -* Eficent +* ForgeFlow * Sodexis Contributors ~~~~~~~~~~~~ -* `Eficent `_: +* `ForgeFlow `_: * Jordi Ballester Alomar (jordi.ballester@eficent.com) * Miquel Raïch (miquel.raich@eficent.com) - * Pedro Gonzalez (pedro.gonzalez@pesol.es) + * Bernat Puig Font (bernat.puig@forgeflow.com) +* Pedro Gonzalez (pedro.gonzalez@pesol.es) * `Tecnativa `_: * David Vidal @@ -102,6 +108,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_team/__manifest__.py b/mail_activity_team/__manifest__.py index 87fede2e2..d5662e1ed 100644 --- a/mail_activity_team/__manifest__.py +++ b/mail_activity_team/__manifest__.py @@ -1,26 +1,30 @@ -# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. # Copyright 2021 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Mail Activity Team", "summary": "Add Teams to Activities", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "development_status": "Alpha", "category": "Social Network", "website": "https://github.com/OCA/social", - "author": "Eficent, Sodexis, Odoo Community Association (OCA)", + "author": "ForgeFlow, Sodexis, Odoo Community Association (OCA)", "license": "AGPL-3", "installable": True, "depends": ["mail_activity_board"], "data": [ - "views/assets_backend.xml", "security/ir.model.access.csv", "security/mail_activity_team_security.xml", "views/mail_activity_team_views.xml", "views/mail_activity_views.xml", "views/res_users_views.xml", ], - "qweb": [ - "static/src/xml/systray.xml", - ], + "assets": { + "web.assets_backend": [ + "mail_activity_team/static/src/js/systray.esm.js", + ], + "web.assets_qweb": [ + "mail_activity_team/static/src/xml/systray.xml", + ], + }, } diff --git a/mail_activity_team/i18n/mail_activity_team.pot b/mail_activity_team/i18n/mail_activity_team.pot index 7c023b7f2..d27a13daf 100644 --- a/mail_activity_team/i18n/mail_activity_team.pot +++ b/mail_activity_team/i18n/mail_activity_team.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -56,26 +56,17 @@ msgid "Created on" msgstr "" #. module: mail_activity_team -#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__display_name -#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_mixin__display_name #: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__display_name -#: model:ir.model.fields,field_description:mail_activity_team.field_res_users__display_name msgid "Display Name" msgstr "" #. module: mail_activity_team -#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__id -#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_mixin__id #: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__id -#: model:ir.model.fields,field_description:mail_activity_team.field_res_users__id msgid "ID" msgstr "" #. module: mail_activity_team -#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity____last_update -#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_mixin____last_update #: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team____last_update -#: model:ir.model.fields,field_description:mail_activity_team.field_res_users____last_update msgid "Last Modified on" msgstr "" @@ -152,7 +143,8 @@ msgstr "" #. module: mail_activity_team #: code:addons/mail_activity_team/models/mail_activity.py:0 #, python-format -msgid "The assigned user %s is not member of the team %s." +msgid "" +"The assigned user %(user_name)s is not member of the team %(team_name)s." msgstr "" #. module: mail_activity_team @@ -166,16 +158,7 @@ msgid "Users" msgstr "" #. module: mail_activity_team -#: model:ir.model.fields,field_description:mail_activity_team.field_account_bank_statement_line__activity_team_user_ids -#: model:ir.model.fields,field_description:mail_activity_team.field_account_journal__activity_team_user_ids -#: model:ir.model.fields,field_description:mail_activity_team.field_account_move__activity_team_user_ids -#: model:ir.model.fields,field_description:mail_activity_team.field_account_payment__activity_team_user_ids -#: model:ir.model.fields,field_description:mail_activity_team.field_event_event__activity_team_user_ids -#: model:ir.model.fields,field_description:mail_activity_team.field_event_registration__activity_team_user_ids #: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_mixin__activity_team_user_ids -#: model:ir.model.fields,field_description:mail_activity_team.field_mailing_mailing__activity_team_user_ids -#: model:ir.model.fields,field_description:mail_activity_team.field_product_product__activity_team_user_ids -#: model:ir.model.fields,field_description:mail_activity_team.field_product_template__activity_team_user_ids #: model:ir.model.fields,field_description:mail_activity_team.field_res_partner__activity_team_user_ids #: model:ir.model.fields,field_description:mail_activity_team.field_res_users__activity_team_user_ids msgid "test field" diff --git a/mail_activity_team/models/mail_activity.py b/mail_activity_team/models/mail_activity.py index 1d7714927..d200d77a4 100644 --- a/mail_activity_team/models/mail_activity.py +++ b/mail_activity_team/models/mail_activity.py @@ -1,4 +1,4 @@ -# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import SUPERUSER_ID, _, api, fields, models from odoo.exceptions import ValidationError @@ -11,7 +11,7 @@ class MailActivity(models.Model): if not user_id: user_id = self.env.uid res_model = self.env.context.get("default_res_model") - model = self.env["ir.model"].search([("model", "=", res_model)], limit=1) + model = self.sudo().env["ir.model"].search([("model", "=", res_model)], limit=1) domain = [("member_ids", "in", [user_id])] if res_model: domain.extend( @@ -74,6 +74,10 @@ class MailActivity(models.Model): not in activity.team_id.with_context(active_test=False).member_ids ): raise ValidationError( - _("The assigned user %s is not member of the team %s.") - % (activity.user_id.name, activity.team_id.name) + _( + "The assigned user %(user_name)s is " + "not member of the team %(team_name)s.", + user_name=activity.user_id.name, + team_name=activity.team_id.name, + ) ) diff --git a/mail_activity_team/models/mail_activity_mixin.py b/mail_activity_team/models/mail_activity_mixin.py index fca47e89e..d9ea56e15 100644 --- a/mail_activity_team/models/mail_activity_mixin.py +++ b/mail_activity_team/models/mail_activity_mixin.py @@ -18,6 +18,22 @@ class MailActivityMixin(models.AbstractModel): for rec in self: rec.activity_team_user_ids = rec.activity_ids.mapped("team_id.member_ids") + def _search_my_activity_date_deadline(self, operator, operand): + if not self._context.get("team_activities", False): + return super(MailActivityMixin, self)._search_my_activity_date_deadline( + operator, operand + ) + activity_ids = self.env["mail.activity"]._search( + [ + "|", + ("user_id", "=", self.env.user.id), + "&", + ("date_deadline", operator, operand), + ("res_model", "=", self._name), + ] + ) + return [("activity_ids", "in", activity_ids)] + @api.model def _search_activity_team_user_ids(self, operator, operand): return [("activity_ids.team_id.member_ids", operator, operand)] diff --git a/mail_activity_team/models/mail_activity_team.py b/mail_activity_team/models/mail_activity_team.py index e49f8d829..e59540154 100644 --- a/mail_activity_team/models/mail_activity_team.py +++ b/mail_activity_team/models/mail_activity_team.py @@ -1,4 +1,4 @@ -# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. # Copyright 2021 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, fields, models @@ -19,8 +19,8 @@ class MailActivityTeam(models.Model): domain.append(("res_model_id", "in", team.res_model_ids.ids)) team.count_missing_activities = activity_model.search(domain, count=True) - name = fields.Char(string="Name", required=True, translate=True) - active = fields.Boolean(string="Active", default=True) + name = fields.Char(required=True, translate=True) + active = fields.Boolean(default=True) res_model_ids = fields.Many2many( comodel_name="ir.model", string="Used models", diff --git a/mail_activity_team/models/res_users.py b/mail_activity_team/models/res_users.py index 8990fb80b..8493d4f1d 100644 --- a/mail_activity_team/models/res_users.py +++ b/mail_activity_team/models/res_users.py @@ -1,4 +1,4 @@ -# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, fields, models, modules @@ -44,7 +44,7 @@ class ResUsers(models.Model): activity_data = self.env.cr.dictfetchall() model_ids = [a["id"] for a in activity_data] model_names = { - n[0]: n[1] for n in self.env["ir.model"].browse(model_ids).name_get() + n[0]: n[1] for n in self.env["ir.model"].sudo().browse(model_ids).name_get() } user_activities = {} for activity in activity_data: @@ -66,9 +66,4 @@ class ResUsers(models.Model): ] += activity["count"] if activity["states"] in ("today", "overdue"): user_activities[activity["model"]]["total_count"] += activity["count"] - if activity["user_id"] == user and activity["states"] in ( - "today", - "overdue", - ): - user_activities[activity["model"]]["total_count"] -= activity["count"] return list(user_activities.values()) diff --git a/mail_activity_team/readme/CONTRIBUTORS.rst b/mail_activity_team/readme/CONTRIBUTORS.rst index f52e9e066..977f558de 100644 --- a/mail_activity_team/readme/CONTRIBUTORS.rst +++ b/mail_activity_team/readme/CONTRIBUTORS.rst @@ -1,8 +1,9 @@ -* `Eficent `_: +* `ForgeFlow `_: * Jordi Ballester Alomar (jordi.ballester@eficent.com) * Miquel Raïch (miquel.raich@eficent.com) - * Pedro Gonzalez (pedro.gonzalez@pesol.es) + * Bernat Puig Font (bernat.puig@forgeflow.com) +* Pedro Gonzalez (pedro.gonzalez@pesol.es) * `Tecnativa `_: * David Vidal diff --git a/mail_activity_team/readme/ROADMAP.rst b/mail_activity_team/readme/ROADMAP.rst new file mode 100644 index 000000000..82a350a5c --- /dev/null +++ b/mail_activity_team/readme/ROADMAP.rst @@ -0,0 +1 @@ +* In next version systray.esm.js file should be changed as added in comments. diff --git a/mail_activity_team/static/description/index.html b/mail_activity_team/static/description/index.html index 52643f7ff..6d9e9a01b 100644 --- a/mail_activity_team/static/description/index.html +++ b/mail_activity_team/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Alpha License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

+

Alpha License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

This module adds the possibility to assign teams to activities.

Important

@@ -379,11 +379,12 @@ Only for development or testing purpose, do not use in production.
+
+

Known issues / Roadmap

+
    +
  • In next version systray.esm.js file should be changed as added in comments.
    • +
+
-

Bug Tracker

+

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.

-

Credits

+

Credits

-

Authors

+

Authors

    -
  • Eficent
    • +
  • ForgeFlow
  • Sodexis
-

Contributors

+

Contributors

-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association

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_team/static/src/js/systray.esm.js b/mail_activity_team/static/src/js/systray.esm.js new file mode 100644 index 000000000..ea10bf895 --- /dev/null +++ b/mail_activity_team/static/src/js/systray.esm.js @@ -0,0 +1,94 @@ +/** @odoo-module **/ +import ActivityMenu from "@mail/js/systray/systray_activity_menu"; +import {session} from "@web/session"; + +ActivityMenu.include({ + events: _.extend({}, ActivityMenu.prototype.events, { + "click .o_filter_button": "_onClickFilterButton", + }), + start: function () { + this._super.apply(this, arguments); + this.$filter_buttons = this.$(".o_filter_button"); + this.$my_activities = this.$filter_buttons.first(); + this.filter = "my"; + this.user_context = session.user_context; + this.user_context = _.extend({}, session.user_context, { + team_activities: false, + }); + }, + + _updateCounter: function () { + this._super.apply(this, arguments); + this.$(".o_notification_counter").text(this.activityCounter); + }, + + _onClickFilterButton: function (event) { + var self = this; + event.stopPropagation(); + self.$filter_buttons.removeClass("active"); + var $target = $(event.currentTarget); + $target.addClass("active"); + self.filter = $target.data("filter"); + + self.user_context = _.extend({}, session.user_context, { + team_activities: self.filter === "team", + }); + + self._updateActivityPreview(); + }, + _onActivityFilterClick: function (event) { + if (this.filter === "my") { + this._super.apply(this, arguments); + } + if (this.filter === "team") { + var data = _.extend( + {}, + $(event.currentTarget).data(), + $(event.target).data() + ); + var context = {}; + context.team_activities = 1; + if (data.filter === "my") { + context.search_default_activities_overdue = 1; + context.search_default_activities_today = 1; + } else { + context["search_default_activities_" + data.filter] = 1; + } + this.do_action({ + type: "ir.actions.act_window", + name: data.model_name, + res_model: data.res_model, + views: [ + [false, "kanban"], + [false, "form"], + ], + search_view_id: [false], + domain: [["activity_team_user_ids", "in", session.uid]], + context: context, + }); + } + }, + _getActivityData: function () { + var self = this; + + return self + ._rpc({ + model: "res.users", + method: "systray_get_activities", + args: [], + kwargs: {context: self.user_context}, + }) + .then(function (data) { + self._activities = data; + self.activityCounter = _.reduce( + data, + function (total_count, p_data) { + return total_count + p_data.total_count || 0; + }, + 0 + ); + self.$(".o_notification_counter").text(self.activityCounter); + self.$el.toggleClass("o_no_notification", !self.activityCounter); + }); + }, +}); diff --git a/mail_activity_team/static/src/js/systray.js b/mail_activity_team/static/src/js/systray.js deleted file mode 100644 index dbf5f753f..000000000 --- a/mail_activity_team/static/src/js/systray.js +++ /dev/null @@ -1,102 +0,0 @@ -odoo.define("mail_activity_team.systray.ActivityMenu", function (require) { - "use strict"; - - var ActivityMenu = require("mail.systray.ActivityMenu"); - var session = require("web.session"); - - ActivityMenu.include({ - events: _.extend({}, ActivityMenu.prototype.events, { - "click .o_filter_button": "_onClickFilterButton", - }), - start: function () { - this._super.apply(this, arguments); - this.$filter_buttons = this.$(".o_filter_button"); - this.$my_activities = this.$filter_buttons.first(); - this.filter = "my"; - session.user_context = _.extend({}, session.user_context, { - team_activities: false, - }); - }, - - _updateCounter: function () { - this._super.apply(this, arguments); - this.$(".o_notification_counter").text(this.activityCounter); - }, - - _onClickFilterButton: function (event) { - var self = this; - event.stopPropagation(); - self.$filter_buttons.removeClass("active"); - var $target = $(event.currentTarget); - $target.addClass("active"); - self.filter = $target.data("filter"); - - session.user_context = _.extend({}, session.user_context, { - team_activities: self.filter === "team", - }); - - self._updateActivityPreview(); - }, - _onActivityFilterClick: function (event) { - if (this.filter === "my") { - this._super.apply(this, arguments); - } - if (this.filter === "team") { - var data = _.extend( - {}, - $(event.currentTarget).data(), - $(event.target).data() - ); - var context = {}; - if (data.filter === "my") { - context.search_default_activities_overdue = 1; - context.search_default_activities_today = 1; - } else { - context["search_default_activities_" + data.filter] = 1; - } - this.do_action({ - type: "ir.actions.act_window", - name: data.model_name, - res_model: data.res_model, - views: [ - [false, "kanban"], - [false, "form"], - ], - search_view_id: [false], - domain: [["activity_team_user_ids", "in", session.uid]], - context: context, - }); - } - }, - _getActivityData: function () { - var self = this; - return self._super.apply(self, arguments).then(function () { - session.user_context = _.extend({}, session.user_context, { - team_activities: !session.user_context.team_activities, - }); - - self._rpc({ - model: "res.users", - method: "systray_get_activities", - args: [], - kwargs: { - context: session.user_context, - }, - }).then(function (data) { - self.activityCounter += _.reduce( - data, - function (total_count, p_data) { - return total_count + p_data.total_count || 0; - }, - 0 - ); - self.$(".o_notification_counter").text(self.activityCounter); - self.$el.toggleClass("o_no_notification", !self.activityCounter); - session.user_context = _.extend({}, session.user_context, { - team_activities: !session.user_context.team_activities, - }); - }); - }); - }, - }); -}); diff --git a/mail_activity_team/tests/test_mail_activity_team.py b/mail_activity_team/tests/test_mail_activity_team.py index 201c816b4..f458323df 100644 --- a/mail_activity_team/tests/test_mail_activity_team.py +++ b/mail_activity_team/tests/test_mail_activity_team.py @@ -1,4 +1,4 @@ -# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# Copyright 2018-22 ForgeFlow Business and IT Consulting Services, S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.exceptions import ValidationError from odoo.tests.common import TransactionCase @@ -48,7 +48,7 @@ class TestMailActivityTeam(TransactionCase): "delay_count": 5, "delay_unit": "days", "summary": "ACT 1 : Presentation, barbecue, ... ", - "res_model_id": self.partner_ir_model.id, + "res_model": self.partner_ir_model.model, } ) self.activity2 = activity_type_model.create( @@ -57,7 +57,7 @@ class TestMailActivityTeam(TransactionCase): "delay_count": 6, "delay_unit": "days", "summary": "ACT 2 : I want to show you my ERP !", - "res_model_id": self.partner_ir_model.id, + "res_model": self.partner_ir_model.model, } ) @@ -148,7 +148,6 @@ class TestMailActivityTeam(TransactionCase): self.assertEqual( self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1." ) - self.act2.team_id = False self.act2._onchange_team_id() self.assertEqual(self.act2.user_id, self.employee) self.act2.team_id = self.team2 @@ -174,7 +173,7 @@ class TestMailActivityTeam(TransactionCase): def test_schedule_activity(self): """Correctly assign teams to auto scheduled activities. Those won't trigger onchanges and could raise constraints and team missmatches""" - partner_record = self.employee.partner_id.sudo(self.employee.id) + partner_record = self.employee.partner_id.with_user(self.employee.id) activity = partner_record.activity_schedule( user_id=self.employee2.id, activity_type_id=self.env.ref("mail.mail_activity_data_call").id, diff --git a/mail_activity_team/views/assets_backend.xml b/mail_activity_team/views/assets_backend.xml deleted file mode 100644 index f5f3eeee0..000000000 --- a/mail_activity_team/views/assets_backend.xml +++ /dev/null @@ -1,11 +0,0 @@ - - -