mirror of
https://github.com/OCA/knowledge.git
synced 2025-07-24 17:38:42 -06:00
add access validation to approval
(../7.0pageapproval/ rev 8)
This commit is contained in:
parent
19e016bf75
commit
0e79e6f0e3
@ -34,5 +34,9 @@ Add a workflow to approve page modification and show the approved version by def
|
|||||||
'installable': True,
|
'installable': True,
|
||||||
'auto_install': False,
|
'auto_install': False,
|
||||||
'images': [],
|
'images': [],
|
||||||
|
'data': [
|
||||||
|
'security/document_page_security.xml',
|
||||||
|
'security/ir.model.access.csv',
|
||||||
|
]
|
||||||
}
|
}
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
@ -35,10 +35,11 @@ class document_page_history_wkfl(orm.Model):
|
|||||||
})
|
})
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def _is_parent_approval_required(self, cr, uid, ids, name, args, context=None):
|
def can_user_approve_page(self, cr, uid, ids, name, args, context=None):
|
||||||
res = {}
|
user = self.pool.get('res.users').browse(cr,uid,uid)
|
||||||
for page in self.browse(cr, uid, ids, context=context):
|
for page in self.browse(cr, uid, ids, context=context):
|
||||||
res[page.id] = page.page_id.is_parent_approval_required
|
res[page.id] = page.approver_gid in user.groups_id
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
@ -47,7 +48,9 @@ class document_page_history_wkfl(orm.Model):
|
|||||||
('approved','Approved')], 'Status', readonly=True),
|
('approved','Approved')], 'Status', readonly=True),
|
||||||
'approved_date': fields.datetime("Approved Date"),
|
'approved_date': fields.datetime("Approved Date"),
|
||||||
'approved_uid': fields.many2one('res.users', "Approved By"),
|
'approved_uid': fields.many2one('res.users', "Approved By"),
|
||||||
'is_parent_approval_required': fields.function(_is_parent_approval_required, string="parent approval", type='boolean'),
|
'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'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user