From 8da2cb6d4a6b99ef56cbb64a7c8753ab9a0e3365 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:31:55 +0200
Subject: [PATCH 1/5] [FIX] definition of badges

---
 addons/website_forum/data/badges_participation.xml | 6 +++---
 addons/website_forum/data/badges_question.xml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_forum/data/badges_participation.xml b/addons/website_forum/data/badges_participation.xml
index 05c2540d77d..fc07eaaf864 100644
--- a/addons/website_forum/data/badges_participation.xml
+++ b/addons/website_forum/data/badges_participation.xml
@@ -78,16 +78,16 @@
             <field name="target_goal">10</field>
         </record>
 
-        <!-- Pundit: 10 comments with at least score of 10 -->
+        <!-- Pundit: 10 answers with at least score of 10 -->
         <record id="badge_25" model="gamification.badge">
             <field name="name">Pundit</field>
-            <field name="description">Left comments with score of 10 or more</field>
+            <field name="description">Left 10 answers with score of 10 or more</field>
             <field name="level">silver</field>
             <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_pundit">
             <field name="name">Pundit</field>
-            <field name="description">Post 10 comments with score of 10 or more</field>
+            <field name="description">Post 10 answers with score of 10 or more</field>
             <field name="display_mode">boolean</field>
             <field name="condition">higher</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post')"/>
diff --git a/addons/website_forum/data/badges_question.xml b/addons/website_forum/data/badges_question.xml
index ff2d63c034d..39c1fca9f20 100644
--- a/addons/website_forum/data/badges_question.xml
+++ b/addons/website_forum/data/badges_question.xml
@@ -372,7 +372,7 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post')" />
-            <field name="domain">[('parent_id', '=', False), ('is_correct', '=', True)]</field>
+            <field name="domain">[('parent_id', '=', False), ('has_validated_answer', '=', True)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
             <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />

From c786ceb760563e5cdc205c1dd2b95e6513426244 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:32:21 +0200
Subject: [PATCH 2/5] [FIX] the badges should be ordered by most popular first

---
 addons/website_forum/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index f196909b065..b94e818d0c5 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -599,6 +599,7 @@ class WebsiteForum(http.Controller):
         Badge = request.registry['gamification.badge']
         badge_ids = Badge.search(cr, SUPERUSER_ID, [('challenge_ids.category', '=', 'forum')], context=context)
         badges = Badge.browse(cr, uid, badge_ids, context=context)
+        badges = sorted(badges, key=lambda b: b.stat_count_distinct, reverse=True)
         values = self._prepare_forum_values(forum=forum, searches={'badges': True})
         values.update({
             'badges': badges,

From 70d3652c27ce0a6936f30eaf8af124676e5fa90a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:41:56 +0200
Subject: [PATCH 3/5] [FIX] remove closing reason 'an answer was accepted', the
 questions should be left as open to be possible to improve the answer
 afterward

---
 addons/website_forum/data/forum_data.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index a387a8de7ae..2db99477f61 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -70,9 +70,6 @@
         <record id="reason_4" model="forum.post.reason">
             <field name="name">not a real question</field>
         </record>
-        <record id="reason_5" model="forum.post.reason">
-            <field name="name">already answered and an answer was accepted</field>
-        </record>
         <record id="reason_6" model="forum.post.reason">
             <field name="name">not relevant or out dated</field>
         </record>

From 4d9aa300a725d0bbdfadd87d547e150769f13f40 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 14:50:51 +0200
Subject: [PATCH 4/5] [IMP] as the closing reason is not required, do not
 display it if none is present

---
 addons/website_forum/views/website_forum.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 0f132c48420..f596193c56a 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -436,7 +436,7 @@
                 </h1>
                 <div class="alert alert-info text-center" t-if="question.state == 'close'">
                     <p class="mt16">
-                        <b>The question has been closed for reason: <i t-esc="question.closed_reason_id.name"/></b>
+                        <b>The question has been closed<t t-if="question.closed_reason_id"> for reason: <i t-esc="question.closed_reason_id.name"/></t></b>
                     </p>
                     <t t-if="question.closed_uid">
                         <b>by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.closed_uid.id }"

From a558a8463000644142aa2210bd1b3db9def66375 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 15:05:27 +0200
Subject: [PATCH 5/5] [IMP] display the createion date of the question the same
 way we display the answer fate

---
 addons/website_forum/views/website_forum.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index f596193c56a..c47d15004dd 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -514,6 +514,7 @@
                                 t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                                 style="display: inline-block;"/>
                             <div t-field="question.create_uid" t-field-options='{"widget": "contact", "badges": true, "fields": ["karma"]}'/>
+                            <span class="text-muted">Asked on <span t-field="question.create_date" t-field-options='{"format":"short"}'/></span>
                         </div>
                     </div>
                 </div>