From 1c4180c0f35201f4088366d9fb5c593227fc6db9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 28 Mar 2014 14:33:57 +0530
Subject: [PATCH] [IMP] improved code, not show challanges assinged to user for
 forum.

bzr revid: tpa@tinyerp.com-20140328090357-gm5qjza4hchbet0i
---
 addons/website_forum/controllers/main.py      |  1 +
 .../website_forum/data/forum_default_faq.html |  3 --
 addons/website_forum/models/forum.py          | 28 +++++++++++--------
 addons/website_forum/models/gamification.py   | 14 ++++++++++
 addons/website_forum/views/website_forum.xml  |  2 +-
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 69f45302aa7..154c9e4a68b 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -236,6 +236,7 @@ class website_forum(http.Controller):
 
         #votes which given on users questions and answers.
         data = Vote.read_group(cr, uid, [('post_id.forum_id', '=', forum.id), ('post_id.user_id', '=', user.id)], ["vote"], groupby=["vote"], context=context)
+        up_votes, down_votes = 0, 0
         for rec in data:
             if rec['vote'] == '1':
                 up_votes = rec['vote_count']
diff --git a/addons/website_forum/data/forum_default_faq.html b/addons/website_forum/data/forum_default_faq.html
index 30d8ecfbd92..591417f02d1 100644
--- a/addons/website_forum/data/forum_default_faq.html
+++ b/addons/website_forum/data/forum_default_faq.html
@@ -116,9 +116,6 @@
     </tr><tr>
         <td class="faq-rep-item"><strong>300</strong></td>
         <td>edit any post, view offensive flags</td>
-    </tr><tr>
-        <td class="faq-rep-item"><strong>400</strong></td>
-        <td>delete any comment</td>
     </tr><tr>
         <td class="faq-rep-item"><strong>500</strong></td>
         <td>accept any answer (after 1 week)</td>
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 3fbcec1cd12..8cd5c67aff4 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -33,10 +33,26 @@ class Forum(osv.Model):
     _name = 'website.forum'
     _description = 'Forums'
     _inherit = ['mail.thread', 'website.seo.metadata']
+
+    def _get_right_column(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        for forum in self.browse(cr, uid, ids, context=context):
+            res[forum.id] = """<div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">About This Forum</h3>
+                </div>
+                <div class="panel-body">
+                    This community is for professionals and enthusiasts of our 
+                    products and services.<br/>
+                    <a href="/forum/%s/faq" class="fa fa-arrow-right"> Read Guidelines</a>
+                </div>
+            </div>""" % slug(forum)
+        return res
+
     _columns = {
         'name': fields.char('Name', required=True, translate=True),
         'faq': fields.html('Guidelines'),
-        'right_column': fields.html('Right Column'),
+        'right_column':fields.function(_get_right_column, string="Right Column", type='html', store=True),
     }
     def _get_default_faq(self, cr, uid, context={}):
         fname = openerp.modules.get_module_resource('website_forum', 'data', 'forum_default_faq.html')
@@ -46,16 +62,6 @@ class Forum(osv.Model):
 
     _defaults = {
         'faq': _get_default_faq,
-        'right_column': """<div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">About This Forum</h3>
-                </div>
-                <div class="panel-body">
-                    This community is for professionals and enthusiasts of our 
-                    products and services.<br/>
-                    <a t-attf-href="/forum/1/faq" class="fa fa-arrow-right"> Read Guidelines</a>
-                </div>
-            </div>"""
     }
 
 class Post(osv.Model):
diff --git a/addons/website_forum/models/gamification.py b/addons/website_forum/models/gamification.py
index f29b5985aa9..ecf281bb75a 100644
--- a/addons/website_forum/models/gamification.py
+++ b/addons/website_forum/models/gamification.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import copy
 import openerp
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
@@ -70,3 +71,16 @@ class Badge(osv.Model):
         'level': fields.selection([('bronze', 'bronze'), ('silver', 'silver'), ('gold', 'gold')], 'Forum Badge Level'),
     }
 
+class Users(osv.Model):
+    _inherit = 'res.users'
+
+    def _serialised_goals_summary(self, cr, uid, user_id, context=None):
+        """Do not show forum challenges in user inbox side panel."""
+        all_goals_info = super(Users, self)._serialised_goals_summary(cr, uid, user_id, context=context)
+        goals_info = copy.copy(all_goals_info)
+        challenge_obj = self.pool['gamification.challenge']
+        for goal in all_goals_info:
+            challenge = challenge_obj.browse(cr, uid, goal['id'], context=context)
+            if challenge.category == 'forum':
+                goals_info.remove(goal)
+        return goals_info
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index bf93e33ec1f..4d2b4c1815f 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -849,7 +849,7 @@
                     <div t-esc="len(answer.vote_ids)"/>
                 </div>
                 <div class="question-name" style="margin-left: 32px;">
-                    <a style="font-size: 15px;" t-attf-href="/forum/#{ slug(forum) }/question/#{ answer.parent_id.id }/#answer-#{ answer.id }" t-esc="answer.name"/>
+                    <a style="font-size: 15px;" t-attf-href="/forum/#{ slug(forum) }/question/#{ answer.parent_id.id }/#answer-#{ answer.id }" t-esc="answer.parent_id.name"/>
                     <t t-if="len(answer.website_message_ids)&gt;0">
                         (<t t-esc="len(answer.website_message_ids)"/>
                         <t t-if="len(answer.website_message_ids)&gt;1">Comments</t>