From adc4b0ccd8645956020f34444d75b04fc610b277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= <ivan.todorovich@gmail.com>
Date: Fri, 1 Jun 2018 15:36:19 -0300
Subject: [PATCH] [9.0] Improve document_page (#162)

* [document_page] FIX creating history when there are no changes made. Add history name field, to name revisions. Modified views to allow setting this field.

* [document_page] FIX BUG: UI hanging when editing content. This was due to the api.depends on _compute_diff. Removing it because it's not really necessary since the field is not stored.

* [document_page] page_id should be readonly.

* [document_page] Implement active field

* [document_page] Update version number
---
 document_page/__openerp__.py                  |  2 +-
 document_page/models/document_page.py         | 19 ++++++++++++++++---
 document_page/models/document_page_history.py |  6 +++---
 document_page/views/document_page.xml         | 18 ++++++++++++++----
 document_page/views/document_page_history.xml | 10 ++++++----
 5 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/document_page/__openerp__.py b/document_page/__openerp__.py
index a358f00a..533b9981 100644
--- a/document_page/__openerp__.py
+++ b/document_page/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     'name': 'Document Page',
-    'version': '9.0.2.0.0',
+    'version': '9.0.2.1.0',
     'category': 'Knowledge Management',
     'author': 'OpenERP SA, Odoo Community Association (OCA)',
     'images': ['images/category_list.png', 'images/create_category.png',
diff --git a/document_page/models/document_page.py b/document_page/models/document_page.py
index 1d8d63fe..159f6fdf 100644
--- a/document_page/models/document_page.py
+++ b/document_page/models/document_page.py
@@ -39,6 +39,8 @@ class DocumentPage(models.Model):
         default="content"
     )
 
+    active = fields.Boolean(default=True)
+
     parent_id = fields.Many2one(
         'document.page',
         'Category',
@@ -60,7 +62,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,
@@ -156,10 +167,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 71535701..2e81163b 100644
--- a/document_page/models/document_page_history.py
+++ b/document_page/models/document_page_history.py
@@ -30,12 +30,12 @@ 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
-    @api.depends('content', 'page_id.history_ids')
     def _compute_diff(self):
         """Shows a diff between this version and the previous version"""
         history = self.env['document.page.history']
diff --git a/document_page/views/document_page.xml b/document_page/views/document_page.xml
index deb2810e..22ceb090 100644
--- a/document_page/views/document_page.xml
+++ b/document_page/views/document_page.xml
@@ -40,6 +40,11 @@
             <field name="arch" type="xml">
                 <form string="Document Page">
                     <sheet>
+                        <div class="oe_button_box" name="button_box">
+                            <button name="toggle_active" type="object" groups="document_page.group_document_manager" class="oe_stat_button" icon="fa-archive">
+                                <field name="active" widget="boolean_button" options="{'terminology': 'archive'}"/>
+                            </button>
+                        </div>
                         <field name="type" invisible="1"/>
                         <h1><field name="name" placeholder="Name"/></h1>
                         <group>
@@ -54,16 +59,21 @@
                         </group>
                         <notebook>
                             <page name="content" string="Content">
-                                <label for="summary" class="oe_edit_only" />
-                                <field name="summary" placeholder="eg: Changed ... for ..." class="oe_edit_only" />
-                                <label for="content" class="oe_edit_only"/>
-                                <field name="content" widget="html" placeholder="e.g. Once upon a time..." required="1" options="{'safe': True}"/>
+                                <group string="Revision" class="oe_edit_only">
+                                    <field name="draft_name" placeholder="Rev 01" class="oe_edit_only" />
+                                    <field name="draft_summary" placeholder="eg: Changed ... for ..." class="oe_edit_only" />
+                                </group>
+                                <div>
+                                    <label for="content" class="oe_edit_only"/>
+                                    <field name="content" widget="html" placeholder="e.g. Once upon a time..." required="1" options="{'safe': True}"/>
+                                </div>
                             </page>
                             <page name="history" string="History">
                                 <field name="history_ids">
                                     <tree>
                                         <field name="id"/>
                                         <field name="create_date"/>
+                                        <field name="name"/>
                                         <field name="summary"/>
                                         <field name="create_uid"/>
                                     </tree>
diff --git a/document_page/views/document_page_history.xml b/document_page/views/document_page_history.xml
index 1112e103..4444d82a 100755
--- a/document_page/views/document_page_history.xml
+++ b/document_page/views/document_page_history.xml
@@ -10,6 +10,7 @@
                 <tree string="Document History">
                     <field name="id"/>
                     <field name="page_id"/>
+                    <field name="name"/>
                     <field name="summary"/>
                     <field name="create_uid"/>
                     <field name="create_date"/>
@@ -40,18 +41,19 @@
             <field name="arch" type="xml">
                 <form string="Document Page History">
                     <sheet>
-                        <h1><field name="page_id"/></h1>
+                        <h1><field name="page_id" readonly="1"/></h1>
                         <group>
                             <group>
                                 <field name="create_uid" readonly="1"/>
                                 <field name="create_date" readonly="1"/>
                             </group>
                         </group>
+                        <group>
+                            <field name="name" placeholder="Rev 01"/>
+                            <field name="summary" placeholder="eg: Changed ... for ..."/>
+                        </group>
                         <notebook>
                             <page name="content" string="Content">
-                                <label for="summary"/>
-                                <field name="summary" placeholder="eg: Changed ... for ..."/>
-                                <label for="content"/>
                                 <field name="content" widget="html" placeholder="e.g. Once upon a time..." options="{'safe': True}"/>
                             </page>
                             <page name="diff" string="Changes">