From 75e2954be97a1c3a18b52a50296c9e95e7b3aca5 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 10 Mar 2014 14:17:48 +0530
Subject: [PATCH] [IMP] improved demo data to show proper questions related to
 e-mail tag

bzr revid: tpa@tinyerp.com-20140310084748-nyvvo12tk35flfv4
---
 addons/website_forum/controllers/main.py | 3 ++-
 addons/website_forum/data/forum_demo.xml | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 3284bafc5bf..6cec60076af 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -244,7 +244,8 @@ class website_forum(http.Controller):
     def tag_questions(self, forum, tag, page=1, **kwargs):
         cr, uid, context = request.cr, request.uid, request.context
         Post = request.registry['website.forum.post']
-        obj_ids = Post.search(cr, uid, [('forum_id', '=', forum.id), ('id', 'in', 'tag.post_ids')], context=context)
+        post_ids = [que.id for que in tag.post_ids]
+        obj_ids = Post.search(cr, uid, [('forum_id', '=', forum.id), ('id', 'in', post_ids)], context=context)
         question_ids = Post.browse(cr, uid, obj_ids, context=context)
         pager = request.website.pager(url="/forum/%s/tag" % slug(forum), total=len(tag.post_ids), page=page, step=10, scope=10)
 
diff --git a/addons/website_forum/data/forum_demo.xml b/addons/website_forum/data/forum_demo.xml
index ba62b207e97..c578c89ad99 100644
--- a/addons/website_forum/data/forum_demo.xml
+++ b/addons/website_forum/data/forum_demo.xml
@@ -119,7 +119,7 @@ Thank you in advance</field>
             <field name="forum_id" ref="website_forum.forum_help"/>
             <field name="views">5</field>
             <field name="content">hi, how to import csv into customer database? Thanks</field>
-            <field name="tags" eval="[(4,ref('website_forum.tags_2'))]"/>
+            <field name="tags" eval="[(4,ref('website_forum.tags_2')), (4,ref('website_forum.tags_1'))]"/>
         </record>
                 
         <record id="question_10" model="website.forum.post">
@@ -129,7 +129,7 @@ Thank you in advance</field>
                                There are options to send the invoice,sales order,
                                quotations etc by the email.But the issue is even after the button 'Send By Email' is clicked,
                                the email is not received to the recipients .Those emails are stored in the Archives under the Messaging window.How to configure incoming and outgoing mails in openerp</field>
-           <field name="tags" eval="[(4,ref('website_forum.tags_1'))]"/>
+            <field name="tags" eval="[(4,ref('website_forum.tags_1'))]"/>
             <field name="forum_id" ref="website_forum.forum_help"/>
         </record>
         
@@ -299,7 +299,7 @@ Thank you in advance</field>
         </record>
         
         <record id="tags_1" model="website.forum.tag">
-            <field name="post_ids" eval="[(4,ref('website_forum.question_10'))]"/>
+            <field name="post_ids" eval="[(4,ref('website_forum.question_10')), (4,ref('website_forum.question_9'))]"/>
         </record>
         
         <record id="tags_2" model="website.forum.tag">