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/wizard/document_page_show_diff_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/document_page/wizard/document_page_show_diff_view.xml')

diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
index e2d5ef1af4b..3693af7caad 100644
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -5,7 +5,7 @@
         <!-- Create Index Form view  -->
         <record id="view_wiki_show_diff" model="ir.ui.view">
             <field name="name">Show Difference</field>
-            <field name="model">wizard.document.page.history.show_diff</field>
+            <field name="model">blog.post.history.show_diff</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
                     <field name="diff" widget="html" options='{"safe": True}'/>
@@ -19,7 +19,7 @@
         <record id="action_view_wiki_show_diff" model="ir.actions.act_window">
             <field name="name">Difference</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wizard.document.page.history.show_diff</field>
+            <field name="res_model">blog.post.history.show_diff</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -29,8 +29,8 @@
             id="action_view_wiki_show_diff_values"
             key2="client_action_multi"
             name="Difference"
-            res_model="wizard.document.page.history.show_diff"
-            src_model="document.page.history"
+            res_model="blog.post.history.show_diff"
+            src_model="blog.post.history"
             view_mode="form"
             target="new"
             view_type="form"/>
-- 
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
---
 .../wizard/document_page_show_diff_view.xml        | 39 ----------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 addons/document_page/wizard/document_page_show_diff_view.xml

(limited to 'addons/document_page/wizard/document_page_show_diff_view.xml')

diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
deleted file mode 100644
index 3693af7caad..00000000000
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Create Index Form view  -->
-        <record id="view_wiki_show_diff" model="ir.ui.view">
-            <field name="name">Show Difference</field>
-            <field name="model">blog.post.history.show_diff</field>
-            <field name="arch" type="xml">
-                <form string="Difference" version="7.0">
-                    <field name="diff" widget="html" options='{"safe": True}'/>
-                    <footer>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-        <!-- Create Index Action  -->
-        <record id="action_view_wiki_show_diff" model="ir.actions.act_window">
-            <field name="name">Difference</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">blog.post.history.show_diff</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        <!-- Create Index Action Window  -->
-        <act_window 
-            id="action_view_wiki_show_diff_values"
-            key2="client_action_multi"
-            name="Difference"
-            res_model="blog.post.history.show_diff"
-            src_model="blog.post.history"
-            view_mode="form"
-            target="new"
-            view_type="form"/>
-
-    </data>
-</openerp>
-- 
cgit v1.2.3