diff --git a/document_page_approval/document_page_approval.py b/document_page_approval/document_page_approval.py
index 1c501b33..6e1c9f64 100644
--- a/document_page_approval/document_page_approval.py
+++ b/document_page_approval/document_page_approval.py
@@ -37,10 +37,20 @@ class document_page_history_wkfl(orm.Model):
def can_user_approve_page(self, cr, uid, ids, name, args, context=None):
user = self.pool.get('res.users').browse(cr,uid,uid)
+ res = {}
for page in self.browse(cr, uid, ids, context=context):
- res[page.id] = page.approver_gid in user.groups_id
+ res[page.id]= self.can_user_approve_this_page(page.page_id, user)
return res
+
+ def can_user_approve_this_page(self, page, user):
+ if page:
+ res = page.approver_gid in user.groups_id
+ res = res or self.can_user_approve_this_page(page.parent_id, user)
+ else:
+ res=False
+
+ return res
_columns = {
'state': fields.selection([
@@ -50,10 +60,9 @@ class document_page_history_wkfl(orm.Model):
'approved_uid': fields.many2one('res.users', "Approved By"),
'is_parent_approval_required': fields.related('page_id', 'is_parent_approval_required', string="parent approval", type='boolean', store=False),
'approver_gid': fields.related('page_id', 'approver_gid', string="Approver group", type='many2one', relation='res.groups', store=False),
- 'can_user_approve_page': fields.function(can_user_approve_page, string="can user approve this page", type='boolean'),
+ 'can_user_approve_page': fields.function(can_user_approve_page, string="can user approve this page", type='boolean', store=False),
}
-
class document_page_approval(orm.Model):
_inherit = 'document.page'
def _get_display_content(self, cr, uid, ids, name, args, context=None):
diff --git a/document_page_approval/document_page_view.xml b/document_page_approval/document_page_view.xml
index a9d523b5..f4ac18a8 100644
--- a/document_page_approval/document_page_view.xml
+++ b/document_page_approval/document_page_view.xml
@@ -8,9 +8,12 @@
diff --git a/document_page_approval/security/document_page_security.xml b/document_page_approval/security/document_page_security.xml
new file mode 100644
index 00000000..7192d3f8
--- /dev/null
+++ b/document_page_approval/security/document_page_security.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ Document approver
+
+
+
+
diff --git a/document_page_approval/security/ir.model.access.csv b/document_page_approval/security/ir.model.access.csv
new file mode 100644
index 00000000..e4835836
--- /dev/null
+++ b/document_page_approval/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+document_page_history,document.page.history,model_document_page_history,base.group_document_approver_user,1,1,1,0
\ No newline at end of file