diff --git a/document_page/models/document_page.py b/document_page/models/document_page.py index 24524210..80ffd053 100644 --- a/document_page/models/document_page.py +++ b/document_page/models/document_page.py @@ -42,7 +42,16 @@ class DocumentPage(models.Model): ) # no-op computed field - summary = fields.Char( + draft_name = fields.Char( + string='Name', + help='Name for the changes made', + compute=lambda x: x, + inverse=lambda x: x, + ) + + # no-op computed field + draft_summary = fields.Char( + string='Summary', help='Describe the changes made', compute=lambda x: x, inverse=lambda x: x, @@ -124,10 +133,12 @@ class DocumentPage(models.Model): @api.multi def _inverse_content(self): for rec in self: - if rec.type == 'content': + if rec.type == 'content' and \ + rec.content != rec.history_head.content: rec._create_history({ + 'name': rec.draft_name, + 'summary': rec.draft_summary, 'content': rec.content, - 'summary': rec.summary, }) @api.multi diff --git a/document_page/models/document_page_history.py b/document_page/models/document_page_history.py index a5e70e78..00317854 100644 --- a/document_page/models/document_page_history.py +++ b/document_page/models/document_page_history.py @@ -14,8 +14,9 @@ class DocumentPageHistory(models.Model): _order = 'id DESC' page_id = fields.Many2one('document.page', 'Page', ondelete='cascade') - summary = fields.Char('Summary', index=True) - content = fields.Text("Content") + name = fields.Char(index=True) + summary = fields.Char(index=True) + content = fields.Text() diff = fields.Text(compute='_compute_diff') @api.multi diff --git a/document_page/views/document_page.xml b/document_page/views/document_page.xml index f19341a5..b291673e 100644 --- a/document_page/views/document_page.xml +++ b/document_page/views/document_page.xml @@ -54,17 +54,21 @@ - + diff --git a/document_page/views/document_page_history.xml b/document_page/views/document_page_history.xml index b0b49faf..dd08afa2 100755 --- a/document_page/views/document_page_history.xml +++ b/document_page/views/document_page_history.xml @@ -9,6 +9,7 @@ + @@ -46,11 +47,12 @@ + + + + -