Merge branch 'master' of https://github.com/odoo/odoo

[odoo/odoo.git] / addons / website_forum / views / forum.xml

diff --git a/addons/website_forum/views/forum.xml b/addons/website_forum/views/forum.xml
index 2c6f037..421d76e 100644 (file)
--- a/addons/website_forum/views/forum.xml
+++ b/addons/website_forum/views/forum.xml
@@ -167,6 +167,11 @@
                     <field name="name" string="Content" filter_domain="['|', ('name', 'ilike', self), ('content', 'ilike', self)]"/>
                     <field name="create_uid"/>
                     <field name="forum_id"/>
+                    <field name="tag_ids" string="Tag"/>
+                    <filter string="Question" domain="[('parent_id', '=', False)]" />
+                    <filter string="Answers" domain="[('parent_id', '!=', False)]" />
+                    <filter string="Accepted Answer" domain="[('is_correct' , '!=', False), ('parent_id', '!=', False)]" />
+                    <filter string="Answered Questions" domain="[('child_count', '!=', 0), ('parent_id', '=', False)]" />
                     <group expand="0" string="Group By">
                         <filter string="Forum" domain="[]" context="{'group_by': 'forum_id'}"/>
                         <filter string="Author" domain="[]" context="{'group_by': 'create_uid'}"/>
@@ -175,11 +180,22 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_forum_post_graph">
+            <field name="name">forum.post.graph</field>
+            <field name="model">forum.post</field>
+            <field name="arch" type="xml">
+                <graph string="Graph of Posts" type="pivot">
+                    <field name="write_date" interval="month" type="col" />
+                    <field name="forum_id" type="row" />
+                </graph>
+            </field>
+        </record>
+
         <record id="action_forum_post" model="ir.actions.act_window">
             <field name="name">Forum Posts</field>
             <field name="res_model">forum.post</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_forum_post_list"/>
             <field name="search_view_id" ref="view_forum_post_search"/>
         </record>