From 901f57382605ccb3498666d2c2120ef5143f438d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Sep 2013 13:12:21 +0200
Subject: [REF] document_page: refactored the module, towards using it in
 website_blog Main modifications: - category is now a blog.catory object,
 instead of a document.page with type='category' - added blog.tag model, to be
 able to tag posts - cleaned document.page, now blog.post model, removing type
 and unnecessary features - added chatter on blog.post, blog.category - added
 subtypes to enable direct follow of posts when following a category - updated
 document.page.history (now blog.post.history) - commented menu creation,
 because this does not seem to be necessary anymore considering the new
 website - updated wizard.document.page.history.show_diff, now
 blog.post.history.show_diff - updated all views accordingly, as well as demo
 data - removed the use of document_user group, simplified rules on blog.post
 (not done for new models) - misc cleaning

Next step: merge with website_mail

bzr revid: tde@openerp.com-20130920111221-qy3x5eoyih26axn8
---
 addons/document_page/document_page_view.xml | 172 +++++++++++++++-------------
 1 file changed, 92 insertions(+), 80 deletions(-)

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 9d02b47d265..5cbc947e172 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -1,116 +1,128 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <menuitem name="Knowledge" id="knowledge.menu_document"/>
-       <menuitem name="Pages" id="menu_wiki" parent="knowledge.menu_document" sequence="20" />
+        <menuitem name="Knowledge" id="knowledge.menu_document"/>
+        <menuitem name="Pages" id="menu_wiki" parent="knowledge.menu_document" sequence="20" />
 
-        <!-- wiki tree view -->
-        <record id="view_wiki_tree_children" model="ir.ui.view">
-            <field name="name">document.page.tree</field>
-            <field name="model">document.page</field>
-            <field name="field_parent">child_ids</field>
-            <field name="priority">100</field>
+        <!-- Category views -->
+        <record model="ir.ui.view" id="view_blog_category_list">
+            <field name="name">blog.category.list</field>
+            <field name="model">blog.category</field>
             <field name="arch" type="xml">
-                <tree string="Document Page">
+                <tree string="Blog Categories">
                     <field name="name"/>
-                    <field name="write_uid"/>
-                    <field name="write_date"/>
                 </tree>
             </field>
         </record>
-        <!-- wiki list view  -->
-        <record id="view_wiki_tree" model="ir.ui.view">
-            <field name="name">document.page.list</field>
-            <field name="model">document.page</field>
+        <record model="ir.ui.view" id="view_blog_category_form">
+            <field name="name">blog.category.form</field>
+            <field name="model">blog.category</field>
+            <field name="arch" type="xml">
+                <form string="Blog Category" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="description"/>
+                            <field name="template" widget="html"/>
+                        </group>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <!-- page list view  -->
+        <record model="ir.ui.view" id="view_blog_post_list">
+            <field name="name">blog.post.list</field>
+            <field name="model">blog.post</field>
             <field name="arch" type="xml">
-                <tree string="Document Page">
+                <tree string="Blog Posts">
                     <field name="name"/>
-                    <field name="parent_id"/>
+                    <field name="category_id"/>
                     <field name="create_uid" invisible="1"/>
                     <field name="write_uid"/>
                     <field name="write_date"/>
                 </tree>
             </field>
         </record>
-        <!-- wiki Form view  -->
-        <record id="view_wiki_form" model="ir.ui.view">
-            <field name="name">document.page.form</field>
-            <field name="model">document.page</field>
+        <!-- page form view  -->
+        <record model="ir.ui.view" id="view_blog_post_form">
+            <field name="name">blog.post.form</field>
+            <field name="model">blog.post</field>
             <field name="arch" type="xml">
-                <form string="Document Page" version="7.0">
-                    <field name="type" invisible="1"/>
-                    <h1><field name="name" placeholder="Name"/></h1>
-                    <group class="oe_edit_only">
-                        <group>
-                            <field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Category"/>
-                        </group>
-                        <group>
-                            <field name="write_uid" groups="base.group_no_one"/>
-                            <field name="write_date" groups="base.group_no_one"/>
-                            <field name="menu_id" groups="base.group_no_one"/>
+                <form string="Blog Post" version="7.0">
+                    <sheet>
+                        <h1><field name="name" placeholder="Name"/></h1>
+                        <field name="tag_ids" widget="many2many_tags"/>
+                        <group class="oe_edit_only">
+                            <group>
+                                <field name="category_id" string="Category"/>
+                            </group>
+                            <group>
+                                <field name="write_uid" groups="base.group_no_one"/>
+                                <field name="write_date" groups="base.group_no_one"/>
+                                <field name="menu_id" groups="base.group_no_one"/>
+                            </group>
                         </group>
-                    </group>
-                    <div class="oe_edit_only" attrs="{'invisible':[('type','=','content')]}">
-                        <label for="content" string="Template"/>
-                        that will be used as a content template for all new page of this category.
-                    </div>
-                    <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only" widget="html"/>
-                    <div class="oe_document_page">
-                        <field name="display_content" widget="html" class="oe_view_only" options='{"safe": True}'/>
+                        <div class="oe_document_page">
+                            <field name="content" placeholder="e.g. Once upon a time..." widget="html"/>
+                        </div>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group"/>
                     </div>
                 </form>
             </field>
         </record>
-        <!-- page Search view  -->
-        <record id="view_wiki_filter" model="ir.ui.view">
-            <field name="name">document.page.search</field>
-            <field name="model">document.page</field>
+        <!-- page search view  -->
+        <record model="ir.ui.view" id="view_blog_post_search">
+            <field name="name">blog.post.search</field>
+            <field name="model">blog.post</field>
             <field name="arch" type="xml">
-                <search string="Document Page">
+                <search string="Blog Post">
                     <field name="name" string="Content" filter_domain="['|', ('name','ilike',self), ('content','ilike',self)]"/>
                     <field name="write_uid"/>
-                    <field name="parent_id"/>
+                    <field name="category_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Document Type" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
-                        <filter string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
+                        <filter string="Category" domain="[]" context="{'group_by': 'category_id'}"/>
+                        <filter string="Author" domain="[]" context="{'group_by': 'create_uid'}"/>
+                        <filter string="Last Contributor" domain="[]" context="{'group_by': 'write_uid'}"/>
                     </group>
                 </search>
             </field>
         </record>
         <!-- page action -->
-        <record id="action_page" model="ir.actions.act_window">
-            <field name="name">Pages</field>
-            <field name="res_model">document.page</field>
-            <field name="domain">[('type','=','content')]</field>
-            <field name="context">{'default_type': 'content'}</field>
+        <record model="ir.actions.act_window" id="action_blog_post">
+            <field name="name">Blog Posts</field>
+            <field name="res_model">blog.post</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_wiki_tree"/>
-            <field name="search_view_id" ref="view_wiki_filter"/>
+            <field name="view_id" ref="view_blog_post_list"/>
+            <field name="search_view_id" ref="view_blog_post_search"/>
             <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create a new web page.
-              </p>
+                <p class="oe_view_nocontent_create">
+                    Click to create a new blog post.
+                </p>
             </field>
         </record>
-        <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="10"/>
-        <record id="action_category" model="ir.actions.act_window">
+        <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_blog_post" sequence="10"/>
+
+        <record model="ir.actions.act_window" id="action_blog_category">
             <field name="name">Category</field>
-            <field name="res_model">document.page</field>
-            <field name="domain">[('type','=','category')]</field>
-            <field name="context">{'default_type': 'category'}</field>
+            <field name="res_model">blog.category</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_wiki_tree"/>
-            <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
-        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_category" sequence="20"/>
+        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_blog_category" sequence="20"/>
 
         <!-- History Tree view -->
-        <record model="ir.ui.view" id="view_wiki_history_tree">
-            <field name="name">document.page.history.tree</field>
-            <field name="model">document.page.history</field>
+        <record model="ir.ui.view" id="view_blog_history_tree">
+            <field name="name">blog.post.history.tree</field>
+            <field name="model">blog.post.history</field>
             <field name="arch" type="xml">
                 <tree string="Document History">
                     <field name="create_date"/>
@@ -120,11 +132,11 @@
             </field>
         </record>
         <!-- History Form view  -->
-        <record model="ir.ui.view" id="wiki_history_form">
-            <field name="name">document.page.history.form</field>
-            <field name="model">document.page.history</field>
+        <record model="ir.ui.view" id="view_blog_history_form">
+            <field name="name">blog.post.history.form</field>
+            <field name="model">blog.post.history</field>
             <field name="arch" type="xml">
-                <form string="Document Page History" version="7.0">
+                <form string="Blog Post History" version="7.0">
                     <label for="page_id" class="oe_edit_only"/>
                     <h1><field name="page_id" select="1" /></h1>
                     <label for="create_date" class="oe_edit_only"/>
@@ -137,7 +149,7 @@
         <!-- History Action  -->
         <record model="ir.actions.act_window" id="action_history">
             <field name="name">Page history</field>
-            <field name="res_model">document.page.history</field>
+            <field name="res_model">blog.post.history</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
@@ -147,16 +159,16 @@
             context="{'search_default_page_id': [active_id], 'default_page_id': active_id}"
             domain="[('page_id','=',active_id)]"
             name="Page History"
-            res_model="document.page.history"
-            src_model="document.page"/>
-        <act_window 
+            res_model="blog.post.history"
+            src_model="blog.post"/>
+<!--         <act_window 
             id="action_related_page_create_menu"
             name="Create Menu"
-            res_model="document.page.create.menu"
+            res_model="blog.post.create.menu"
             target="new"
             view_type="form"
             view_mode="form"
-            src_model="document.page"/>
+            src_model="blog.post"/> -->
 
     </data>
 </openerp>
-- 
cgit v1.2.3


From 6cf170312716c2a85611e9f1ff5dc838431872cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Sep 2013 15:12:26 +0200
Subject: [IMP] document_page: continuing small cleaning - News category is now
 a data, not a demo anymore - improved blog.post form view - small cleaning in
 blog.post fields strings / helps

bzr revid: tde@openerp.com-20130920131226-zj5mrffx0nwt5nkr
---
 addons/document_page/document_page_view.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 5cbc947e172..f341fe7dc90 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -57,15 +57,13 @@
                     <sheet>
                         <h1><field name="name" placeholder="Name"/></h1>
                         <field name="tag_ids" widget="many2many_tags"/>
-                        <group class="oe_edit_only">
-                            <group>
-                                <field name="category_id" string="Category"/>
-                            </group>
-                            <group>
-                                <field name="write_uid" groups="base.group_no_one"/>
-                                <field name="write_date" groups="base.group_no_one"/>
-                                <field name="menu_id" groups="base.group_no_one"/>
-                            </group>
+                        <group>
+                            <field name="category_id" string="Category"/>
+                        </group>
+                        <group>
+                            <field name="write_uid" groups="base.group_no_one"/>
+                            <field name="write_date" groups="base.group_no_one"/>
+                            <field name="menu_id" groups="base.group_no_one"/>
                         </group>
                         <div class="oe_document_page">
                             <field name="content" placeholder="e.g. Once upon a time..." widget="html"/>
-- 
cgit v1.2.3


From 4f1cdefa8ddf4e1a295712e09e562418153f6ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Sep 2013 16:27:01 +0200
Subject: [REF] document_page, website_blog: merge of the two modules.

document_page is now contained inside website_blog, last part of the refactoring before
cleaning and improving the blog feature. Usefull files have been transfered.

Translations have been discarded, they will have to be re-translated again.

Document_page module is now dead. Long live website_blog!

Misc:
- some fixes in website_blog and wizard
- commented some sections of yml tests because they should not apply anymore
- added empty files for python unit tests in website_blog

bzr revid: tde@openerp.com-20130920142701-4lp1my3ajga2puxl
---
 addons/document_page/document_page_view.xml | 172 ----------------------------
 1 file changed, 172 deletions(-)
 delete mode 100644 addons/document_page/document_page_view.xml

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
deleted file mode 100644
index f341fe7dc90..00000000000
--- a/addons/document_page/document_page_view.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <menuitem name="Knowledge" id="knowledge.menu_document"/>
-        <menuitem name="Pages" id="menu_wiki" parent="knowledge.menu_document" sequence="20" />
-
-        <!-- Category views -->
-        <record model="ir.ui.view" id="view_blog_category_list">
-            <field name="name">blog.category.list</field>
-            <field name="model">blog.category</field>
-            <field name="arch" type="xml">
-                <tree string="Blog Categories">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_blog_category_form">
-            <field name="name">blog.category.form</field>
-            <field name="model">blog.category</field>
-            <field name="arch" type="xml">
-                <form string="Blog Category" version="7.0">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                            <field name="description"/>
-                            <field name="template" widget="html"/>
-                        </group>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group"/>
-                    </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- page list view  -->
-        <record model="ir.ui.view" id="view_blog_post_list">
-            <field name="name">blog.post.list</field>
-            <field name="model">blog.post</field>
-            <field name="arch" type="xml">
-                <tree string="Blog Posts">
-                    <field name="name"/>
-                    <field name="category_id"/>
-                    <field name="create_uid" invisible="1"/>
-                    <field name="write_uid"/>
-                    <field name="write_date"/>
-                </tree>
-            </field>
-        </record>
-        <!-- page form view  -->
-        <record model="ir.ui.view" id="view_blog_post_form">
-            <field name="name">blog.post.form</field>
-            <field name="model">blog.post</field>
-            <field name="arch" type="xml">
-                <form string="Blog Post" version="7.0">
-                    <sheet>
-                        <h1><field name="name" placeholder="Name"/></h1>
-                        <field name="tag_ids" widget="many2many_tags"/>
-                        <group>
-                            <field name="category_id" string="Category"/>
-                        </group>
-                        <group>
-                            <field name="write_uid" groups="base.group_no_one"/>
-                            <field name="write_date" groups="base.group_no_one"/>
-                            <field name="menu_id" groups="base.group_no_one"/>
-                        </group>
-                        <div class="oe_document_page">
-                            <field name="content" placeholder="e.g. Once upon a time..." widget="html"/>
-                        </div>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group"/>
-                    </div>
-                </form>
-            </field>
-        </record>
-        <!-- page search view  -->
-        <record model="ir.ui.view" id="view_blog_post_search">
-            <field name="name">blog.post.search</field>
-            <field name="model">blog.post</field>
-            <field name="arch" type="xml">
-                <search string="Blog Post">
-                    <field name="name" string="Content" filter_domain="['|', ('name','ilike',self), ('content','ilike',self)]"/>
-                    <field name="write_uid"/>
-                    <field name="category_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Category" domain="[]" context="{'group_by': 'category_id'}"/>
-                        <filter string="Author" domain="[]" context="{'group_by': 'create_uid'}"/>
-                        <filter string="Last Contributor" domain="[]" context="{'group_by': 'write_uid'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-        <!-- page action -->
-        <record model="ir.actions.act_window" id="action_blog_post">
-            <field name="name">Blog Posts</field>
-            <field name="res_model">blog.post</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_blog_post_list"/>
-            <field name="search_view_id" ref="view_blog_post_search"/>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to create a new blog post.
-                </p>
-            </field>
-        </record>
-        <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_blog_post" sequence="10"/>
-
-        <record model="ir.actions.act_window" id="action_blog_category">
-            <field name="name">Category</field>
-            <field name="res_model">blog.category</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_blog_category" sequence="20"/>
-
-        <!-- History Tree view -->
-        <record model="ir.ui.view" id="view_blog_history_tree">
-            <field name="name">blog.post.history.tree</field>
-            <field name="model">blog.post.history</field>
-            <field name="arch" type="xml">
-                <tree string="Document History">
-                    <field name="create_date"/>
-                    <field name="create_uid"/>
-                    <field name="page_id"/>
-                </tree>
-            </field>
-        </record>
-        <!-- History Form view  -->
-        <record model="ir.ui.view" id="view_blog_history_form">
-            <field name="name">blog.post.history.form</field>
-            <field name="model">blog.post.history</field>
-            <field name="arch" type="xml">
-                <form string="Blog Post History" version="7.0">
-                    <label for="page_id" class="oe_edit_only"/>
-                    <h1><field name="page_id" select="1" /></h1>
-                    <label for="create_date" class="oe_edit_only"/>
-                    <field name="create_date" readonly="1"/>
-                    <label for="content" class="oe_edit_only"/>
-                    <field name="content" colspan="4"/>
-                </form>
-            </field>
-        </record>
-        <!-- History Action  -->
-        <record model="ir.actions.act_window" id="action_history">
-            <field name="name">Page history</field>
-            <field name="res_model">blog.post.history</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem id="menu_page_history" parent="menu_wiki" name="Pages history" action="action_history" sequence="30" groups="base.group_no_one"/>
-        <act_window
-            id="action_related_page_history"
-            context="{'search_default_page_id': [active_id], 'default_page_id': active_id}"
-            domain="[('page_id','=',active_id)]"
-            name="Page History"
-            res_model="blog.post.history"
-            src_model="blog.post"/>
-<!--         <act_window 
-            id="action_related_page_create_menu"
-            name="Create Menu"
-            res_model="blog.post.create.menu"
-            target="new"
-            view_type="form"
-            view_mode="form"
-            src_model="blog.post"/> -->
-
-    </data>
-</openerp>
-- 
cgit v1.2.3