From bb90405d48ca5ca6689085f61e77f0836772fc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= Date: Fri, 20 Apr 2018 10:42:49 -0300 Subject: [PATCH 01/11] [document_page_approval] Rename classes and files to match model names, and removed workflow engine. --- document_page_approval/models/__init__.py | 2 +- ...ment_page_approval.py => document_page.py} | 6 +- ...y_workflow.py => document_page_history.py} | 79 +++++++++++-------- .../tests/test_document_page_approval.py | 14 ++-- .../views/document_page_approval.xml | 10 +-- 5 files changed, 60 insertions(+), 51 deletions(-) rename document_page_approval/models/{document_page_approval.py => document_page.py} (96%) rename document_page_approval/models/{document_page_history_workflow.py => document_page_history.py} (70%) diff --git a/document_page_approval/models/__init__.py b/document_page_approval/models/__init__.py index e1b9d5b5..a382c9e1 100644 --- a/document_page_approval/models/__init__.py +++ b/document_page_approval/models/__init__.py @@ -1 +1 @@ -from . import document_page_approval, document_page_history_workflow +from . import document_page, document_page_history diff --git a/document_page_approval/models/document_page_approval.py b/document_page_approval/models/document_page.py similarity index 96% rename from document_page_approval/models/document_page_approval.py rename to document_page_approval/models/document_page.py index 370b4407..9b6a568b 100644 --- a/document_page_approval/models/document_page_approval.py +++ b/document_page_approval/models/document_page.py @@ -6,7 +6,7 @@ from odoo import api, fields, models from ast import literal_eval -class DocumentPageApproval(models.Model): +class DocumentPage(models.Model): """Useful to know the state of a document.""" _inherit = 'document.page' @@ -121,8 +121,8 @@ class DocumentPageApproval(models.Model): @api.multi def _create_history(self, vals): - res = super(DocumentPageApproval, self)._create_history(vals) - res.document_page_auto_confirm() + res = super(DocumentPage, self)._create_history(vals) + res.action_to_approve() @api.multi def action_changes_pending_approval(self): diff --git a/document_page_approval/models/document_page_history_workflow.py b/document_page_approval/models/document_page_history.py similarity index 70% rename from document_page_approval/models/document_page_history_workflow.py rename to document_page_approval/models/document_page_history.py index 3944afec..b1d4ee69 100644 --- a/document_page_approval/models/document_page_history_workflow.py +++ b/document_page_approval/models/document_page_history.py @@ -1,14 +1,12 @@ # Copyright (C) 2013 Savoir-faire Linux (). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from datetime import datetime from odoo.tools.translate import _ -from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT from odoo import api, fields, models from odoo.exceptions import UserError -class DocumentPageHistoryWorkflow(models.Model): +class DocumentPageHistory(models.Model): """Useful to manage edition's workflow on a document.""" _name = 'document.page.history' @@ -20,8 +18,8 @@ class DocumentPageHistoryWorkflow(models.Model): ('approved', 'Approved'), ('cancelled', 'Cancelled')], 'Status', + default='draft', readonly=True, - default='draft' ) approved_date = fields.Datetime( @@ -52,56 +50,67 @@ class DocumentPageHistoryWorkflow(models.Model): ) @api.multi - def page_approval_draft(self): + def action_draft(self): """Set a change request as draft""" - if self.filtered(lambda r: r.state not in [ - 'cancelled', 'approved']): - raise UserError(_("It's not cancelled or approved")) - if self.filtered(lambda r: - r.state == 'approved' and not self.am_i_approver): - raise UserError(_("You are not an appover to reset to draft")) - self.write({'state': 'draft'}) + for rec in self: + if not rec.state == 'cancelled': + raise UserError( + _('You need to cancel it before reopening.')) + if not (rec.am_i_owner or rec.am_i_approver): + raise UserError( + _('You are not authorized to do this.\r\n' + 'Only owners or approvers can reopen Change Requests.')) + rec.write({'state': 'draft'}) @api.multi - def document_page_auto_confirm(self): - """Automatic Transitions for change requests created directly from - documents - """ - if self.filtered(lambda r: r.state != 'draft'): - raise UserError(_("It's not in draft state")) - to_approve = self.filtered(lambda r: r.is_approval_required) - to_approve.write({'state': 'to approve'}) - approved = (self - to_approve) - approved.write({'state': 'approved'}) - approved.mapped('page_id')._compute_history_head() - - @api.multi - def page_approval_to_approve(self): + def action_to_approve(self): """Set a change request as to approve""" - self.write({'state': 'to approve'}) template = self.env.ref( 'document_page_approval.email_template_new_draft_need_approval') approver_gid = self.env.ref( 'document_page_approval.group_document_approver_user') for rec in self: + if rec.state != 'draft': + raise UserError( + _("Can't approve pages in '%s' state.") % rec.state) + if not (rec.am_i_owner or rec.am_i_approver): + raise UserError( + _('You are not authorized to do this.\r\n' + 'Only owners or approvers can request approval.')) + # request approval if rec.is_approval_required: + 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)]) rec.message_subscribe_users([u.id for u in users]) rec.message_post_with_template(template.id) + else: + # auto-approve if approval is not required + rec.action_approve() @api.multi - def page_approval_approved(self): + def action_approve(self): """Set a change request as approved.""" - self.write({ - 'state': 'approved', - 'approved_date': datetime.now().strftime( - DEFAULT_SERVER_DATETIME_FORMAT), - 'approved_uid': self.env.uid - }) for rec in self: + if rec.state not in ['draft', 'to approve']: + raise UserError( + _("Can't approve page in '%s' state.") % rec.state) + if not rec.am_i_approver: + raise UserError(_( + 'You are not authorized to do this.\r\n' + 'Only approvers with these groups can approve this: ' + ) % ', '.join( + [g.display_name + for g in rec.page_id.approver_group_ids]) + ) + # Update state + rec.write({ + 'state': 'approved', + 'approved_date': fields.datetime.now(), + 'approved_uid': self.env.uid, + }) # Trigger computed field update rec.page_id._compute_history_head() # Notify state change @@ -120,7 +129,7 @@ class DocumentPageHistoryWorkflow(models.Model): ) @api.multi - def page_approval_cancelled(self): + def action_cancel(self): """Set a change request as cancelled.""" self.write({'state': 'cancelled'}) for rec in self: diff --git a/document_page_approval/tests/test_document_page_approval.py b/document_page_approval/tests/test_document_page_approval.py index 8fcd73e9..12cdfdbf 100644 --- a/document_page_approval/tests/test_document_page_approval.py +++ b/document_page_approval/tests/test_document_page_approval.py @@ -47,7 +47,7 @@ class TestDocumentPageApproval(common.TransactionCase): self.assertTrue(chreq.am_i_approver) # approve - chreq.page_approval_approved() + chreq.action_approve() self.assertEqual(chreq.state, 'approved') self.assertEqual(chreq.content, page.content) @@ -58,7 +58,7 @@ class TestDocumentPageApproval(common.TransactionCase): ('page_id', '=', page.id), ('state', '!=', 'approved') ])[0] - chreq.page_approval_approved() + chreq.action_approve() self.assertEqual(page.content, 'New content') def test_change_request_auto_approve(self): @@ -74,7 +74,7 @@ class TestDocumentPageApproval(common.TransactionCase): self.history_obj.search([ ('page_id', '=', page.id), ('state', '!=', 'approved') - ]).page_approval_approved() + ]).action_approve() # new change request from scrath chreq = self.history_obj.create({ @@ -88,25 +88,25 @@ class TestDocumentPageApproval(common.TransactionCase): self.assertNotEqual(page.approved_date, chreq.approved_date) self.assertNotEqual(page.approved_uid, chreq.approved_uid) - chreq.page_approval_to_approve() + chreq.action_to_approve() self.assertEqual(chreq.state, 'to approve') self.assertNotEqual(page.content, chreq.content) self.assertNotEqual(page.approved_date, chreq.approved_date) self.assertNotEqual(page.approved_uid, chreq.approved_uid) - chreq.page_approval_cancelled() + chreq.action_cancel() self.assertEqual(chreq.state, 'cancelled') self.assertNotEqual(page.content, chreq.content) self.assertNotEqual(page.approved_date, chreq.approved_date) self.assertNotEqual(page.approved_uid, chreq.approved_uid) - chreq.page_approval_draft() + chreq.action_draft() self.assertEqual(chreq.state, 'draft') self.assertNotEqual(page.content, chreq.content) self.assertNotEqual(page.approved_date, chreq.approved_date) self.assertNotEqual(page.approved_uid, chreq.approved_uid) - chreq.page_approval_approved() + chreq.action_approve() self.assertEqual(chreq.state, 'approved') self.assertEqual(page.content, chreq.content) self.assertEqual(page.approved_date, chreq.approved_date) diff --git a/document_page_approval/views/document_page_approval.xml b/document_page_approval/views/document_page_approval.xml index 3d7ec0cd..825a0cb7 100644 --- a/document_page_approval/views/document_page_approval.xml +++ b/document_page_approval/views/document_page_approval.xml @@ -10,19 +10,19 @@
- From 59bace071a7e240e088b60550c986c6a4902def9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= Date: Tue, 24 Apr 2018 15:37:38 -0300 Subject: [PATCH 06/11] [document_page_approval] Update version number --- document_page_approval/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/document_page_approval/__manifest__.py b/document_page_approval/__manifest__.py index 61a39bfc..46aaf9eb 100644 --- a/document_page_approval/__manifest__.py +++ b/document_page_approval/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Document Page Approval', - 'version': '11.0.1.0.0', + 'version': '11.0.2.0.0', "author": "Savoir-faire Linux, Odoo Community Association (OCA)", "website": "http://www.savoirfairelinux.com", "license": "AGPL-3", From fffc39a01470ccf34178fed1363276dfd364a4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= Date: Tue, 24 Apr 2018 15:50:18 -0300 Subject: [PATCH 07/11] [document_page_approval] Fix LINT --- document_page_approval/models/document_page_history.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/document_page_approval/models/document_page_history.py b/document_page_approval/models/document_page_history.py index b1d4ee69..d769d6d2 100644 --- a/document_page_approval/models/document_page_history.py +++ b/document_page_approval/models/document_page_history.py @@ -102,9 +102,8 @@ class DocumentPageHistory(models.Model): 'You are not authorized to do this.\r\n' 'Only approvers with these groups can approve this: ' ) % ', '.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', From dce03abb17c4975703ad4478a8bcf7ba18f6d494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= Date: Tue, 24 Apr 2018 19:57:09 -0300 Subject: [PATCH 08/11] [document_page_approval] Add ir.rules for document.page.history --- .../security/document_page_security.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/document_page_approval/security/document_page_security.xml b/document_page_approval/security/document_page_security.xml index ab80c13f..ab79d1ef 100644 --- a/document_page_approval/security/document_page_security.xml +++ b/document_page_approval/security/document_page_security.xml @@ -11,4 +11,25 @@ + + Change Request Global + + ['|',('state','=','approved'),('create_uid','=',user.id)] + + + + + + + + Change Request Approver + + + [('state','!=','draft')] + + + + + + From 3a142e7ba2ccb9e8c48345cce5ff5e9892111933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= Date: Tue, 24 Apr 2018 20:07:07 -0300 Subject: [PATCH 09/11] [document_page_approval] Allow to quickly cancel&draft from 'to approve' state --- document_page_approval/models/document_page_history.py | 6 ++++++ document_page_approval/views/document_page_approval.xml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/document_page_approval/models/document_page_history.py b/document_page_approval/models/document_page_history.py index d769d6d2..32c56f24 100644 --- a/document_page_approval/models/document_page_history.py +++ b/document_page_approval/models/document_page_history.py @@ -139,6 +139,12 @@ class DocumentPageHistory(models.Model): ) % (rec.display_name, self.env.user.name) ) + @api.multi + def action_cancel_and_draft(self): + """Set a change request as draft, cancelling it first""" + self.action_cancel() + self.action_draft() + @api.multi def _compute_am_i_owner(self): """Check if current user is the owner""" diff --git a/document_page_approval/views/document_page_approval.xml b/document_page_approval/views/document_page_approval.xml index 2ae3b0f1..5f7759c6 100644 --- a/document_page_approval/views/document_page_approval.xml +++ b/document_page_approval/views/document_page_approval.xml @@ -24,6 +24,9 @@