diff --git a/document_page/__manifest__.py b/document_page/__manifest__.py index a6573d96..6c44dccd 100644 --- a/document_page/__manifest__.py +++ b/document_page/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Document Page', - 'version': '11.0.2.0.0', + 'version': '11.0.2.1.0', 'category': 'Knowledge Management', 'author': 'OpenERP SA, Odoo Community Association (OCA)', 'images': [ diff --git a/document_page/models/document_page.py b/document_page/models/document_page.py index 3cb3b527..5ec91dea 100644 --- a/document_page/models/document_page.py +++ b/document_page/models/document_page.py @@ -104,6 +104,14 @@ class DocumentPage(models.Model): readonly=True, ) + company_id = fields.Many2one( + 'res.company', + 'Company', + help='If set, page is accessible only from this company', + index=True, + ondelete='cascade', + ) + @api.multi def _get_page_index(self, link=True): """Return the index of a document.""" diff --git a/document_page/models/document_page_history.py b/document_page/models/document_page_history.py index 31411ba7..d7e4a356 100644 --- a/document_page/models/document_page_history.py +++ b/document_page/models/document_page_history.py @@ -19,6 +19,16 @@ class DocumentPageHistory(models.Model): content = fields.Text() diff = fields.Text(compute='_compute_diff') + company_id = fields.Many2one( + 'res.company', + 'Company', + help='If set, page is accessible only from this company', + related='page_id.company_id', + store=True, + index=True, + readonly=True, + ) + @api.multi def _compute_diff(self): """Shows a diff between this version and the previous version""" diff --git a/document_page/security/document_page_security.xml b/document_page/security/document_page_security.xml index 57495106..7124e7fd 100644 --- a/document_page/security/document_page_security.xml +++ b/document_page/security/document_page_security.xml @@ -14,4 +14,18 @@ + + document_page multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + document_page_history multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + diff --git a/document_page/views/document_page.xml b/document_page/views/document_page.xml index c9681ff5..aad355c1 100644 --- a/document_page/views/document_page.xml +++ b/document_page/views/document_page.xml @@ -24,6 +24,7 @@ + @@ -50,6 +51,7 @@ +