Merge pull request #382 from OCA/16.0

Syncing from upstream OCA/server-backend (16.0)

Author: bt-admin

README.md

@@ -31,8 +31,8 @@ addon | version | maintainers | summary
 [base_import_match](base_import_match/) | 16.0.1.0.0 |  | Try to avoid duplicates before importing
 [base_portal_type](base_portal_type/) | 16.0.1.0.0 | [![hbrunn](https://github.com/hbrunn.png?size=30px)](https://github.com/hbrunn) | Base module to allow different types of portals
 [base_user_effective_permissions](base_user_effective_permissions/) | 16.0.1.0.0 | [![hbrunn](https://github.com/hbrunn.png?size=30px)](https://github.com/hbrunn) | Inspect effective permissions applying to a user
-[base_user_role](base_user_role/) | 16.0.1.4.2 | [![sebalix](https://github.com/sebalix.png?size=30px)](https://github.com/sebalix) [![jcdrubay](https://github.com/jcdrubay.png?size=30px)](https://github.com/jcdrubay) [![novawish](https://github.com/novawish.png?size=30px)](https://github.com/novawish) | User roles
-[base_user_role_company](base_user_role_company/) | 16.0.1.2.1 |  | User roles by company
+[base_user_role](base_user_role/) | 16.0.1.4.3 | [![sebalix](https://github.com/sebalix.png?size=30px)](https://github.com/sebalix) [![jcdrubay](https://github.com/jcdrubay.png?size=30px)](https://github.com/jcdrubay) [![novawish](https://github.com/novawish.png?size=30px)](https://github.com/novawish) | User roles
+[base_user_role_company](base_user_role_company/) | 16.0.1.2.2 |  | User roles by company
 [base_user_role_history](base_user_role_history/) | 16.0.1.0.0 | [![ThomasBinsfeld](https://github.com/ThomasBinsfeld.png?size=30px)](https://github.com/ThomasBinsfeld) | This module allows to track the changes on users roles.
 [server_action_navigate](server_action_navigate/) | 16.0.1.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) [![ashishhirpara](https://github.com/ashishhirpara.png?size=30px)](https://github.com/ashishhirpara) | Navigate between any items of any Odoo Models
 [server_action_sort](server_action_sort/) | 16.0.1.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Sort any lines of any models by any criterias

base_user_role/README.rst

@@ -7,7 +7,7 @@ User roles
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:bedebf94569063b6e3e5d0d56361045ce2f33fb17ebe96e2e6851c41907d5eca
+   !! source digest: sha256:aa45c0a49bc7d34f53210530575d414b89030caee34f48536323309ac28df5c7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

base_user_role/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     "name": "User roles",
-    "version": "16.0.1.4.2",
+    "version": "16.0.1.4.3",
     "category": "Tools",
     "author": "ABF OSIELL, Odoo Community Association (OCA)",
     "license": "LGPL-3",

base_user_role/models/user.py

@@ -34,15 +34,21 @@ def _default_role_lines(self):
         default_user = self.env.ref("base.default_user", raise_if_not_found=False)
         default_values = []
         if default_user:
-            for role_line in default_user.with_context(active_test=False).role_line_ids:
-                default_values.append(
-                    {
-                        "role_id": role_line.role_id.id,
-                        "date_from": role_line.date_from,
-                        "date_to": role_line.date_to,
-                        "is_enabled": role_line.is_enabled,
-                    }
-                )
+            default_values = default_user._get_role_lines_vals_from_user()
+        return default_values
+
+    def _get_role_lines_vals_from_user(self):
+        self.ensure_one()
+        default_values = []
+        for role_line in self.with_context(active_test=False).role_line_ids:
+            default_values.append(
+                {
+                    "role_id": role_line.role_id.id,
+                    "date_from": role_line.date_from,
+                    "date_to": role_line.date_to,
+                    "is_enabled": role_line.is_enabled,
+                }
+            )
         return default_values
 
     @api.depends("role_line_ids.role_id")
@@ -97,3 +103,15 @@ def set_groups_from_roles(self, force=False):
                 vals = {"groups_id": groups}
                 super(ResUsers, user).write(vals)
         return True
+
+    def copy(self, default=None):
+        self.ensure_one()
+        portal_user = self.env.ref(
+            "base.template_portal_user_id", raise_if_not_found=False
+        )
+        if portal_user and self == portal_user:
+            default["role_line_ids"] = [
+                (0, 0, role_vals)
+                for role_vals in portal_user._get_role_lines_vals_from_user()
+            ]
+        return super().copy(default=default)

base_user_role/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">User roles</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:bedebf94569063b6e3e5d0d56361045ce2f33fb17ebe96e2e6851c41907d5eca
+!! source digest: sha256:aa45c0a49bc7d34f53210530575d414b89030caee34f48536323309ac28df5c7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to extend the standard functionality regarding users

base_user_role/tests/test_user_role.py

@@ -274,3 +274,35 @@ def test_group_groups_into_role(self):
         self.assertEqual(new_role.name, "Test Role")
         # Check that the role has the correct groups (even if the order is not equal)
         self.assertEqual(set(new_role.implied_ids.ids), set(user_group_ids))
+
+    def test_role_default_user(self):
+        """
+        Test that portal user has the right role and groups based on the portal
+        template.
+        """
+        self.default_user.write(
+            {
+                "role_line_ids": [
+                    (0, 0, {"role_id": self.role1_id.id}),
+                    (0, 0, {"role_id": self.role2_id.id}),
+                ]
+            }
+        )
+
+        portal_template = self.env.ref("base.template_portal_user_id")
+        portal_group = self.env.ref("base.group_portal")
+        vals = {
+            "name": "Portal Role",
+            "implied_ids": [(6, 0, [portal_group.id])],
+        }
+        portal_role = self.role_model.create(vals)
+        portal_template.write({"role_line_ids": [(0, 0, {"role_id": portal_role.id})]})
+        portal_user = portal_template.copy(
+            {
+                "name": "New portal user",
+                "active": True,
+            }
+        )
+        portal_user = portal_user.with_context(active_test=False)
+        self.assertNotIn(self.group_user_id, set(portal_user.groups_id))
+        self.assertIn(portal_role.group_id, set(portal_user.groups_id))

base_user_role_company/README.rst

@@ -7,7 +7,7 @@ User roles by company
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:052116258bc0120ce711f5653d1175632c4da4d09e61cfe6f4029ce7e3f2d180
+   !! source digest: sha256:ccf57421a8b2d55598cffef87eb074983438bc7f352b8b6cc86ef150638049e0
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

base_user_role_company/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "16.0.1.2.1",
+    "version": "16.0.1.2.2",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",

base_user_role_company/models/user.py

@@ -27,7 +27,7 @@ def _get_enabled_roles(self):
                 company_ids = self.env.context.get("active_company_ids")
             else:
                 company_ids = self.company_id.ids
-            for role_line in self.role_line_ids:
+            for role_line in res:
                 if not role_line.company_id:
                     active_roles |= role_line
                 elif role_line.company_id.id in company_ids:

base_user_role_company/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">User roles by company</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:052116258bc0120ce711f5653d1175632c4da4d09e61cfe6f4029ce7e3f2d180
+!! source digest: sha256:ccf57421a8b2d55598cffef87eb074983438bc7f352b8b6cc86ef150638049e0
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-backend/tree/16.0/base_user_role_company"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-16-0/server-backend-16-0-base_user_role_company"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-backend&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Enable User Roles depending on the Companies selected.</p>

base_user_role_company/tests/__init__.py

@@ -1 +1,2 @@
 from . import test_role_per_company
+from . import test_use_only_enabled_roles

base_user_role_company/tests/test_use_only_enabled_roles.py

@@ -0,0 +1,62 @@
+# Copyright 2021 Open Source Integrators
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+from datetime import timedelta
+
+from odoo import fields
+from odoo.tests.common import TransactionCase
+
+
+class TestUserRoleCompany(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.company1 = cls.env.ref("base.main_company")
+        # GROUPS for roles
+        cls.groupA = cls.env.ref("base.group_user")
+        cls.groupB = cls.env.ref("base.group_system")
+        # ROLES
+        cls.Role = cls.env["res.users.role"]
+        cls.roleA = cls.Role.create({"name": "Role internal user"})
+        cls.roleA.implied_ids |= cls.groupA
+        cls.roleB = cls.Role.create({"name": "Role system user"})
+        # USER with roles
+        cls.roleB.implied_ids |= cls.groupB
+        cls.User = cls.env["res.users"]
+        user_vals = {
+            "name": "Role test user",
+            "login": "role_test_user",
+            "company_ids": [(fields.Command.set([cls.company1.id]))],
+            "role_line_ids": [
+                (fields.Command.create({"role_id": cls.roleA.id})),
+                (
+                    fields.Command.create(
+                        {
+                            "role_id": cls.roleB.id,
+                            "date_to": fields.Date.today() + timedelta(days=1),
+                        }
+                    )
+                ),
+            ],
+        }
+        cls.test_user = cls.User.create(user_vals)
+
+    def test_110_enabled_role_is_used(self):
+        # User should be in group A and B because date_to is in the future
+        self.test_user.with_context(
+            active_company_ids=self.company1.ids
+        ).set_groups_from_roles()
+        expected = self.groupA | self.groupB
+        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)
+
+    def test_120_disabled_role_is_not_used(self):
+        # User should not be in group B because date_to is in the past
+        self.test_user.role_line_ids.filtered(
+            lambda x: x.role_id == self.roleB
+        ).date_to = fields.Date.today() - timedelta(days=1)
+        self.test_user.with_context(
+            active_company_ids=self.company1.ids
+        ).set_groups_from_roles()
+        expected = self.groupA
+        found = self.test_user.groups_id.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)