[MIG] document_page_approval: Migration to 19.0

Author: gregory-rutecki

document_page_approval/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Document Page Approval",
-    "version": "18.0.1.1.1",
+    "version": "19.0.1.1.1",
     "author": "Savoir-faire Linux, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/knowledge",
     "license": "AGPL-3",

document_page_approval/models/document_page.py

@@ -109,7 +109,7 @@ def can_user_approve_this_page(self, user):
         if not self.approver_group_ids:
             return True
         # to approve, user must belong to any of the approver groups
-        return len(user.groups_id & self.approver_group_ids) > 0
+        return len(user.group_ids & self.approver_group_ids) > 0
 
     def _compute_has_changes_pending_approval(self):
         history = self.env["document.page.history"]

document_page_approval/models/document_page_history.py

@@ -5,7 +5,6 @@
 from odoo import fields, models
 from odoo.exceptions import UserError
 from odoo.tools.misc import clean_context
-from odoo.tools.translate import _
 
 
 class DocumentPageHistory(models.Model):
@@ -37,18 +36,22 @@ class DocumentPageHistory(models.Model):
 
     am_i_owner = fields.Boolean(compute="_compute_am_i_owner")
 
-    am_i_approver = fields.Boolean(related="page_id.am_i_approver", related_sudo=False)
+    am_i_approver = fields.Boolean(
+        related="page_id.am_i_approver", related_sudo=False
+    )
 
     page_url = fields.Text(compute="_compute_page_url", string="URL")
 
     def action_draft(self):
         """Set a change request as draft"""
         for rec in self:
             if not rec.state == "cancelled":
-                raise UserError(_("You need to cancel it before reopening."))
+                raise UserError(
+                    self.env._("You need to cancel it before reopening.")
+                )
             if not (rec.am_i_owner or rec.am_i_approver):
                 raise UserError(
-                    _(
+                    self.env._(
                         "You are not authorized to do this.\r\n"
                         "Only owners or approvers can reopen Change Requests."
                     )
@@ -65,10 +68,12 @@ def action_to_approve(self):
         )
         for rec in self:
             if rec.state != "draft":
-                raise UserError(_("Can't approve pages in '%s' state.") % rec.state)
+                raise UserError(
+                    self.env._("Can't approve pages in '%s' state.", rec.state)
+                )
             if not (rec.am_i_owner or rec.am_i_approver):
                 raise UserError(
-                    _(
+                    self.env._(
                         "You are not authorized to do this.\r\n"
                         "Only owners or approvers can request approval."
                     )
@@ -78,9 +83,14 @@ def action_to_approve(self):
                 rec.write({"state": "to approve"})
                 guids = [g.id for g in rec.page_id.approver_group_ids]
                 users = self.env["res.users"].search(
-                    [("groups_id", "in", guids), ("groups_id", "in", approver_gid.id)]
+                    [
+                        ("group_ids", "in", guids),
+                        ("group_ids", "in", approver_gid.id),
+                    ]
+                )
+                rec.message_subscribe(
+                    partner_ids=users.mapped("partner_id").ids
                 )
-                rec.message_subscribe(partner_ids=users.mapped("partner_id").ids)
                 # pylint: disable=W8121
                 rec.with_context(
                     clean_context(self.env.context)
@@ -93,24 +103,29 @@ def action_approve(self):
         """Set a change request as approved."""
         for rec in self:
             if rec.state not in ["draft", "to approve"]:
-                raise UserError(_("Can't approve page in '%s' state.") % rec.state)
+                raise UserError(
+                    self.env._(
+                        "Can't approve page in '%s' state.", rec.state
+                    )
+                )
             if not rec.am_i_approver:
                 raise UserError(
-                    _(
+                    self.env._(
                         "You are not authorized to do this.\r\n"
-                        "Only approvers with these groups can approve this: {}"
-                    ).format(
+                        "Only approvers with these groups can approve"
+                        " this: %s",
                         ", ".join(
-                            [g.display_name for g in rec.page_id.approver_group_ids]
-                        )
+                            g.display_name
+                            for g in rec.page_id.approver_group_ids
+                        ),
                     )
                 )
 
             # Update state
             rec.write(
                 {
                     "state": "approved",
-                    "approved_date": fields.datetime.now(),
+                    "approved_date": fields.Datetime.now(),
                     "approved_uid": self.env.uid,
                 }
             )
@@ -119,13 +134,18 @@ def action_approve(self):
             # Notify state change
             rec.message_post(
                 subtype_xmlid="mail.mt_comment",
-                body=_("Change request has been approved by %s.")
-                % (self.env.user.name),
+                body=self.env._(
+                    "Change request has been approved by %s.",
+                    self.env.user.name,
+                ),
             )
             # Notify followers a new version is available
             rec.page_id.message_post(
                 subtype_xmlid="mail.mt_comment",
-                body=_("New version of the document %s approved.") % (rec.page_id.name),
+                body=self.env._(
+                    "New version of the document %s approved.",
+                    rec.page_id.name,
+                ),
             )
 
     def action_cancel(self):
@@ -134,8 +154,12 @@ def action_cancel(self):
         for rec in self:
             rec.message_post(
                 subtype_xmlid="mail.mt_comment",
-                body=_("Change request <b>%(name)s</b> has been cancelled by %(user)s.")
-                % ({"name": rec.display_name, "user": self.env.user.name}),
+                body=self.env._(
+                    "Change request <b>%(name)s</b> has been"
+                    " cancelled by %(user)s.",
+                    name=rec.display_name,
+                    user=self.env.user.name,
+                ),
             )
 
     def action_cancel_and_draft(self):
@@ -166,10 +190,15 @@ def _compute_diff(self):
         """Shows a diff between this version and the previous version"""
         history = self.env["document.page.history"]
         for rec in self:
-            domain = [("page_id", "=", rec.page_id.id), ("state", "=", "approved")]
+            domain = [
+                ("page_id", "=", rec.page_id.id),
+                ("state", "=", "approved"),
+            ]
             if rec.approved_date:
                 domain.append(("approved_date", "<", rec.approved_date))
-            prev = history.search(domain, limit=1, order="approved_date DESC")
+            prev = history.search(
+                domain, limit=1, order="approved_date DESC"
+            )
             if prev:
                 rec.diff = self._get_diff(prev.id, rec.id)
             else:

document_page_approval/security/document_page_security.xml

@@ -2,7 +2,7 @@
 <odoo>
     <record id="group_document_approver_user" model="res.groups">
         <field name="name">Approver</field>
-        <field name="category_id" ref="document_knowledge.module_category_knowledge" />
+        <field name="privilege_id" ref="document_knowledge.res_groups_privilege_knowledge" />
         <field
             name="implied_ids"
             eval="[(4, ref('document_page.group_document_editor'))]"

document_page_approval/tests/test_document_page_approval.py

@@ -28,7 +28,7 @@ def setUpClass(cls):
         cls.approver_gid = cls.env.ref(
             "document_page_approval.group_document_approver_user"
         )
-        cls.user2.write({"groups_id": [Command.link(cls.approver_gid.id)]})
+        cls.user2.write({"group_ids": [Command.link(cls.approver_gid.id)]})
 
         # Create category and page that require approval
         cls.category2 = cls.page_obj.create(
@@ -167,7 +167,7 @@ def test_can_user_approve_this_page(self):
         )
 
         # Remove approval group from user2
-        self.user2.write({"groups_id": [(3, self.approver_gid.id)]})
+        self.user2.write({"group_ids": [(3, self.approver_gid.id)]})
         self.assertFalse(
             self.page2.with_user(self.user2).can_user_approve_this_page(self.user2)
         )

setup/document_page_approval/pyproject.toml

@@ -0,0 +1,7 @@
+[project]
+name = "odoo-addon-document_page_approval"
+dynamic = ["version"]
+
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"