[IMP] website_forum: cleaned subtypes + jump at install + cleaned post closing reasons

bzr revid: tde@openerp.com-20140410101801-h5pzk85tdhn7nf17

1 files changed, 25 insertions, 34 deletions

diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index af9a8738b20..81ea39b700d 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
 
         <record id="forum_help" model="website.forum">
             <field name="name">Help</field>
@@ -10,29 +10,31 @@
             <field name="name">Forum</field>
             <field name="url" eval="'/forum/'+str(ref('website_forum.forum_help'))"/>
             <field name="parent_id" ref="website.main_menu"/>
-            <field name="sequence" type="int">40</field>
+            <field name="sequence" type="int">35</field>
+        </record>
+
+        <record id="default_allow_auth_signup" model="ir.config_parameter"> 
+            <field name="key">auth_signup.allow_uninvited</field>
+            <field name="value" eval="True"/>
         </record>
 
-        <!--record id="action_open_website" model="ir.actions.act_url">
-            <field name="name">Website Home</field>
+        <!-- JUMP TO FORUM AT INSTALL -->
+        <record id="action_open_forum" model="ir.actions.act_url">
+            <field name="name">Forum</field>
             <field name="target">self</field>
-            <field name="url">/forum?tutorial.question=true</field>
+            <field name="url" eval="'/forum/'+str(ref('website_forum.forum_help'))+'/#tutorial.forum=true'"/>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
-            <field name="action_id" ref="action_open_website"/>
+            <field name="action_id" ref="action_open_forum"/>
             <field name="state">open</field>
-        </record-->
-
-        <record id="default_allow_auth_signup" model="ir.config_parameter"> 
-            <field name="key">auth_signup.allow_uninvited</field>
-            <field name="value" eval="True"/>
         </record>
 
         <!-- Answers subtypes -->
         <record id="mt_answer_new" model="mail.message.subtype">
             <field name="name">New Answer</field>
             <field name="res_model">website.forum.post</field>
-            <field name="default" eval="False"/>
+            <field name="default" eval="True"/>
+            <field name="hidden" eval="False"/>
             <field name="description">New Answer</field>
         </record>
         <record id="mt_answer_edit" model="mail.message.subtype">
@@ -42,65 +44,54 @@
             <field name="description">Answer Edited</field>
         </record>
         <!-- Questions subtypes -->
-        <record id="mt_question_new" model="mail.message.subtype">
-            <field name="name">New Question</field>
-            <field name="res_model">website.forum.post</field>
-            <field name="default" eval="False"/>
-            <field name="description">New Answer</field>
-        </record>
         <record id="mt_question_edit" model="mail.message.subtype">
             <field name="name">Question Edited</field>
             <field name="res_model">website.forum.post</field>
             <field name="default" eval="False"/>
-            <field name="description">Answer Edited</field>
+            <field name="description">Question Edited</field>
         </record>
         <!-- Questions subtypes to follow Answers -->
-        <record id="mt_question_answer_new" model="mail.message.subtype">
-            <field name="name">New Answer</field>
+<!--         <record id="mt_question_answer_new" model="mail.message.subtype">
+            <field name="name">New Answer (tech for questions)</field>
             <field name="res_model">website.forum.post</field>
             <field name="default" eval="True"/>
             <field name="parent_id" eval="ref('mt_answer_new')"/>
             <field name="relation_field">parent_id</field>
-        </record>
+        </record> -->
 
         <!--At this time create_date is not stores in db for administrator only so for that forcefully updating date. -->
         <record id="base.user_root" model="res.users">
             <field name="create_date" eval="DateTime.today()"/>
         </record>
 
+    </data>
+    <data noupdate="1">
+
         <!-- Reasons for closing Post -->
         <record id="reason_1" model="website.forum.post.reason">
             <field name="name">duplicate question</field>
         </record>
-
         <record id="reason_2" model="website.forum.post.reason">
-            <field name="name">question is off-topic or not relevant</field>
+            <field name="name">off-topic or not relevant</field>
         </record>
-
         <record id="reason_3" model="website.forum.post.reason">
             <field name="name">too subjective and argumentative</field>
         </record>
-
         <record id="reason_4" model="website.forum.post.reason">
             <field name="name">not a real question</field>
         </record>
-
         <record id="reason_5" model="website.forum.post.reason">
-            <field name="name">the question is answered, right answer was accepted</field>
+            <field name="name">already answered and an answer was accepted</field>
         </record>
-
         <record id="reason_6" model="website.forum.post.reason">
-            <field name="name">question is not relevant or out dated</field>
+            <field name="name">not relevant or out dated</field>
         </record>
-
         <record id="reason_7" model="website.forum.post.reason">
-            <field name="name">question contains offensive or malicious remarks</field>
+            <field name="name">contains offensive or malicious remarks</field>
         </record>
-
         <record id="reason_8" model="website.forum.post.reason">
             <field name="name">spam or advertising</field>
         </record>
-
         <record id="reason_9" model="website.forum.post.reason">
             <field name="name">too localized</field>
         </record>