[18.0][MIG] document_page_approval: Migration to 18.0 #524

BhaveshHeliconia · 2025-02-17T11:24:29Z

No description provided.

dreispt · 2025-02-27T22:11:31Z

Can you please rebase on latest 18.0 - that should fix the tests.

(../7.0pageapproval/ rev 1) fix status bar in page approval (../7.0pageapproval/ rev 2) change approval workflow in page history and started to add showing approved page in normal page (../7.0pageapproval/ rev 3) show last approved content and aproved by (../7.0pageapproval/ rev 4) Fix bug on page creation (../7.0pageapproval/ rev 5) add status in history tree view (../7.0pageapproval/ rev 6) add a need approval field and hide the workflow when no approval needed (../7.0pageapproval/ rev 7) add access validation to approval (../7.0pageapproval/ rev 8) give rigth to Page aprover group on the page_history model and hide the button for unallowed group thought the security isn't enforced a the orm level (../7.0pageapproval/ rev 9) made invisible the prover group when not needed (../7.0pageapproval/ rev 10) add email to aprovers group's members (../7.0pageapproval/ rev 11)

[ADD] Translation file + french [FIX] employee_id field does not exist [FIX] user_email field deprecated [IMP] Split long lines [ADD] Images

fix act_draft and minor ui fix remove unused variables change order of xml data files

It should work but further errors could help understand what's going Commented other necessary part Add back workflow Add dependency to knowledge

[IMP] - Improved views to match document_page improvements. [IMP] - Added notification to followers when a new version is approved. [ADD] - Updated document_page_approval pot and added es translations. [IMP] - document_page_approval: Updated spanish translation.

…te module is installed.

* Lint error corrected * test improved * lint error corrected in test file * readme corrected * test improved * test of document page history workflow added * CI error corrected * dreipst comment * Migration to new api improved in model's file and data tag remove in xml file * code totally migrate to odoo 9.0 api * test bug fixed * test error fixed * Lint error improved

…ovements on documents (OCA#155)

* Rename classes and files to match model names, and removed workflow engine. * Some fields should be readonly if not in draft. * Allow Knowledge / Manager to edit previous history names and summary * Improve ux by adding user_has_drafts to document pages. * Changes because of implementation of active field on document_page * Add ir.rules for document.page.history * Allow to quickly cancel&draft from 'to approve' state * FIX BUG: am_i_approver was being run as sudo(), hence always giving the user Approving rights. * FIX hooks Because of default='draft' on the state field, state IS NULL wasn't selecting anything. Left the condition in case this is changed in the future.

[ADD] icon.png

Add the the group eployee to the rule "Change Request Global" to allow to the user with the rule "Change Request Approver" to create pages

[UPD] Update document_page_approval.pot

To pass test is necesary set approval required to False in demo data

… commits

[UPD] Update document_page_approval.pot [UPD] README.rst

…priority)

TT36950 [UPD] Update document_page_approval.pot [UPD] README.rst

[UPD] Update document_page_approval.pot [UPD] README.rst Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: knowledge-16.0/knowledge-16.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-16-0/knowledge-16-0-document_page_approval/

Currently translated at 100.0% (61 of 61 strings) Translation: knowledge-16.0/knowledge-16.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-16-0/knowledge-16-0-document_page_approval/it/ Translated using Weblate (Italian) Currently translated at 100.0% (61 of 61 strings) Translation: knowledge-16.0/knowledge-16.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-16-0/knowledge-16-0-document_page_approval/it/

Currently translated at 83.6% (51 of 61 strings) Translation: knowledge-16.0/knowledge-16.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-16-0/knowledge-16-0-document_page_approval/hr/ Translated using Weblate (Croatian) Currently translated at 96.7% (59 of 61 strings) Translation: knowledge-16.0/knowledge-16.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-16-0/knowledge-16-0-document_page_approval/hr/

Currently translated at 100.0% (61 of 61 strings) Translation: knowledge-16.0/knowledge-16.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-16-0/knowledge-16-0-document_page_approval/it/

[UPD] Update document_page_approval.pot document_page_approval 16.0.1.1.0 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: knowledge-16.0/knowledge-16.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-16-0/knowledge-16-0-document_page_approval/

Currently translated at 98.3% (61 of 62 strings) Translation: knowledge-17.0/knowledge-17.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-17-0/knowledge-17-0-document_page_approval/es/

BhaveshHeliconia · 2025-02-28T06:17:55Z

@dreispt, Please Review. It's done.

dreispt · 2025-02-28T09:00:19Z

document_page_approval/models/document_page_history.py

-                "{}/web#db={}&id={}&" "model=document.page.history"
-            ).format(base_url, self.env.cr.dbname, page.id)
+                f"{base_url}/web#db={self.env.cr.dbname}&id={page.id}&"
+                "model=document.page.history"


Nota that these URLs are still supported, but have changed and might stop working in future versions.

dreispt · 2025-02-28T09:03:07Z

/ocabot migration document_page_approval

victoralmau · 2025-03-25T16:34:54Z

document_page_approval/models/document_page_history.py

+            cleaned_diff = re.sub(r'data-last-history-steps=".*?"', "", raw_diff)
+
+            rec.diff = cleaned_diff


What is the reason for this? Sorry, but I don't understand (if it is necessary, perhaps it would be appropriate to explain in the method the reasons, so that we all know it in the future).

victoralmau · 2025-03-25T16:40:10Z

document_page_approval/tests/test_document_page_approval.py

+        # Ensure test-user2 has write access on document.page.history
+        cls.env["ir.model.access"].create(
+            {
+                "name": "Write Access for Test User2",
+                "model_id": cls.env["ir.model"]._get_id("document.page.history"),
+                "group_id": cls.approver_gid.id,  # Assign to approver group
+                "perm_read": True,
+                "perm_write": True,
+                "perm_create": True,
+                "perm_unlink": True,
+            }
+        )
+
+        # Disable restrictive record rules for the test
+        cls.env["ir.rule"].search(
+            [("model_id", "=", cls.env["ir.model"]._get_id("document.page.history"))]
+        ).write({"active": False})


I don't understand why these changes are necessary. In migrations, the proper thing to do is to reduce the diff (for better readability).

we have to add this because of apply write access to document.page.history

No, doing this in a test is not necessary for at least 99%, and in this case it is not. Doing this indicates that something defined in the test is incorrect. Checking in detail I have already detected what happens, I suggest it now (remember, a test should test a real case, and there was some unnoticed but important step that was not being done).

victoralmau · 2025-03-25T16:42:04Z

document_page_approval/tests/test_document_page_approval.py

+        cls.user2 = new_test_user(cls.env, login="test-user2", groups="base.group_user")
+
+        # Ensure user2 has the approver group
+        cls.approver_gid = cls.env.ref(
+            "document_page_approval.group_document_approver_user"
+        )
+        cls.user2.write({"groups_id": [Command.link(cls.approver_gid.id)]})


Suggested change

cls.user2 = new_test_user(cls.env, login="test-user2", groups="base.group_user")

# Ensure user2 has the approver group

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 = new_test_user(cls.env, login="test-user2", groups="document_page_approval.group_document_approver_user")

cls.approver_gid = cls.env.ref(

"document_page_approval.group_document_approver_user"

)

The base.group_user permission is inherited indirectly with document_knowledge

BhaveshHeliconia · 2025-03-27T11:22:10Z

@victoralmau, Please Review.it's done.

victoralmau

Now you can remove the code from #524 (comment)

victoralmau · 2025-03-27T13:13:41Z

document_page_approval/tests/test_document_page_approval.py

-        self.assertNotEqual(page.approved_date, chreq.approved_date)
-        self.assertNotEqual(page.approved_uid, chreq.approved_uid)

-        chreq.action_to_approve()


It is not necessary to remove it, it is important.

victoralmau · 2025-03-27T13:14:50Z

document_page_approval/tests/test_document_page_approval.py


-        chreq.action_to_approve()
+        # Move change request to 'to approve' state
+        chreq.with_user(self.user2).action_to_approve()


This is not necessary, it is already in “to approve” status requested by the user who created the history.

victoralmau · 2025-03-27T13:16:12Z

document_page_approval/tests/test_document_page_approval.py


-        chreq.action_approve()
+        # Approve the change request
+        chreq.with_user(self.user2).action_approve()


If you want user2 to approve it, you need it to be in “to approve” status, so you will need to do the following first

chreq.action_to_approve() self.assertEqual(chreq.state, "to approve")

victoralmau · 2025-03-28T10:50:21Z

Please, cherry-pick #531 to commit history before migration commit.

BhaveshHeliconia · 2025-03-28T10:53:44Z

@victoralmau, Please Review.i updated test cases.

Steps to reproduce the error: - Modify the content of a page (with a different user). - Go to the Change request menu and Cancel the change. - Click on the "Back to draft" button. - An error will be displayed TT55569

victoralmau

Thank you, good job.

Remember for the future that it is not necessary to add line breaks. I comment this because it helps to reduce the diff of the migration commit and is more readable.

OCA-git-bot · 2025-03-28T11:32:04Z

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

pedrobaeza · 2025-03-28T14:09:12Z

/ocabot merge nobump

OCA-git-bot · 2025-03-28T14:09:27Z

This PR looks fantastic, let's merge it!
Prepared branch 18.0-ocabot-merge-pr-524-by-pedrobaeza-bump-nobump, awaiting test results.

OCA-git-bot · 2025-03-28T14:13:10Z

Congratulations, your PR was merged at 811b070. Thanks a lot for contributing to OCA. ❤️

BhaveshHeliconia mentioned this pull request Feb 17, 2025

Migration to version 18.0 #499

Open

11 tasks

cloutierjo and others added 28 commits February 28, 2025 09:42

[IMP] Documentation

1232fca

[ADD] Translation file + french [FIX] employee_id field does not exist [FIX] user_email field deprecated [IMP] Split long lines [ADD] Images

Set document_page_approval as unported

3237814

start porting

c3dd8a3

fix act_draft and minor ui fix remove unused variables change order of xml data files

Comment workflow that cause the error

08ace91

It should work but further errors could help understand what's going Commented other necessary part Add back workflow Add dependency to knowledge

[FIX] - document-page-approval: Fixes OCA#60 url not valid when websi…

2f590b6

…te module is installed.

[MIG] document_page_approval: Migration to 10.0

38b8c0f

[FIX] View

463bb6c

[IMP][10.0][document_page_approval] Change Requests and workflow impr…

afc1bf0

…ovements on documents (OCA#155)

[MIG] document_page_approval: Migration to 11.0

ffb2adb

[FIX] pylint/javascript-lint

6501702

[ADD] icon.png

[FIX] document_page_aproval: Modify in records rules

a909f5e

Add the the group eployee to the rule "Change Request Global" to allow to the user with the rule "Change Request Approver" to create pages

[MIG] document_page_approval: Migration to v12

e172757

[UPD] Update document_page_approval.pot

[IMP] document_page_approval: black, isort

8d8c8ac

Migrate to 13.0 document_page_approval

cd6a16d

To pass test is necesary set approval required to False in demo data

[IMP] document_page_approval: black, isort, prettier + squashed admin…

508727b

… commits

[MIG] document_page_approval: Migration to 14.0

b4a66d9

[UPD] Update document_page_approval.pot [UPD] README.rst

[FIX] document_page_approval: Avoid W7940 (dangerous-view-replace-wo-…

705bf60

…priority)

[MIG] document_page_approval: Migration to 15.0

a045036

TT36950 [UPD] Update document_page_approval.pot [UPD] README.rst

Translated using Weblate (Italian)

def06b5

Currently translated at 100.0% (61 of 61 strings) Translation: knowledge-16.0/knowledge-16.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-16-0/knowledge-16-0-document_page_approval/it/

Translated using Weblate (Italian)

ae774de

Currently translated at 100.0% (61 of 61 strings) Translation: knowledge-16.0/knowledge-16.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-16-0/knowledge-16-0-document_page_approval/it/

victoralmau and others added 2 commits February 28, 2025 09:42

Translated using Weblate (Spanish)

116562d

Currently translated at 98.3% (61 of 62 strings) Translation: knowledge-17.0/knowledge-17.0-document_page_approval Translate-URL: https://translation.odoo-community.org/projects/knowledge-17-0/knowledge-17-0-document_page_approval/es/

[IMP] document_page_approval: pre-commit auto fixes

a53bc19

BhaveshHeliconia force-pushed the 18.0-mig-document_page_approval branch 2 times, most recently from 72f8257 to feb3997 Compare February 28, 2025 06:10

dreispt reviewed Feb 28, 2025

View reviewed changes

dreispt approved these changes Feb 28, 2025

View reviewed changes

OCA-git-bot added this to the 18.0 milestone Feb 28, 2025

victoralmau suggested changes Mar 25, 2025

View reviewed changes

BhaveshHeliconia force-pushed the 18.0-mig-document_page_approval branch from feb3997 to d9e5bdd Compare March 27, 2025 11:05

victoralmau suggested changes Mar 27, 2025

View reviewed changes

BhaveshHeliconia force-pushed the 18.0-mig-document_page_approval branch from d9e5bdd to 262f507 Compare March 28, 2025 10:50

victoralmau and others added 2 commits March 28, 2025 16:27

[FIX] document_page_approval: Add Change Request Manager rule

d45dd7f

Steps to reproduce the error: - Modify the content of a page (with a different user). - Go to the Change request menu and Cancel the change. - Click on the "Back to draft" button. - An error will be displayed TT55569

[MIG] document_page_approval: Migration to 18.0

a8346c2

BhaveshHeliconia force-pushed the 18.0-mig-document_page_approval branch from 262f507 to a8346c2 Compare March 28, 2025 10:57

victoralmau approved these changes Mar 28, 2025

View reviewed changes

OCA-git-bot added approved ready to merge labels Mar 28, 2025

OCA-git-bot added the bot is merging ⏳ label Mar 28, 2025

OCA-git-bot merged commit 82a9431 into OCA:18.0 Mar 28, 2025
7 checks passed

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Mar 28, 2025

		cleaned_diff = re.sub(r'data-last-history-steps=".*?"', "", raw_diff)

		rec.diff = cleaned_diff

Uh oh!

[18.0][MIG] document_page_approval: Migration to 18.0 #524

[18.0][MIG] document_page_approval: Migration to 18.0 #524

Uh oh!

Conversation

BhaveshHeliconia commented Feb 17, 2025

Uh oh!

dreispt commented Feb 27, 2025

Uh oh!

BhaveshHeliconia commented Feb 28, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dreispt commented Feb 28, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BhaveshHeliconia commented Mar 27, 2025

Uh oh!

victoralmau left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

victoralmau commented Mar 28, 2025

Uh oh!

BhaveshHeliconia commented Mar 28, 2025

Uh oh!

victoralmau left a comment

Choose a reason for hiding this comment

Uh oh!

OCA-git-bot commented Mar 28, 2025

Uh oh!

pedrobaeza commented Mar 28, 2025

Uh oh!

OCA-git-bot commented Mar 28, 2025

Uh oh!

Uh oh!

OCA-git-bot commented Mar 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants