From 53c7fa165dc333086c1e05caa89286c379bca1c7 Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Tue, 11 Mar 2014 14:42:28 +0530
Subject: [PATCH 1/4] [imp]:improve delete question and answer via menu

bzr revid: sunilsharma.sharma07@gmail.com-20140311091228-dch3p1vwjd3jfxyx
---
 addons/website_forum/controllers/main.py           | 14 ++++++++++++++
 addons/website_forum/models/website_forum.py       |  2 +-
 .../static/src/js/website_forum.editor.js          | 13 +++++++++++++
 addons/website_forum/views/website_forum.xml       |  6 +++---
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index cf8c3ee1b8f..3c603ef400b 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -331,3 +331,17 @@ class website_forum(http.Controller):
         record = Post.browse(cr, uid, post_id, context=context)
 
         return record.vote_count
+
+    @http.route('/forum/post_delete/', type='json', auth="user", multilang=True, methods=['POST'], website=True)
+    def delete_answer(self, **kwarg):
+        cr, uid, context = request.cr, request.uid, request.context
+        Post = request.registry['website.forum.post']
+        Post.unlink(cr, uid, [int(kwarg.get('post_id'))], context=context)
+        return True
+    
+    @http.route('/forum/<model("website.forum"):forum>/delete/question/<model("website.forum.post"):post>', type='http', auth="user", multilang=True, website=True)
+    def delete_question(self, forum, post, **kwarg):
+        cr, uid, context = request.cr, request.uid, request.context
+        Post = request.registry['website.forum.post']
+        Post.unlink(cr, uid, [post.id], context=context)
+        return werkzeug.utils.redirect("/forum/%s/" % (slug(forum)))
diff --git a/addons/website_forum/models/website_forum.py b/addons/website_forum/models/website_forum.py
index 8ef9a675572..b92f355b75d 100644
--- a/addons/website_forum/models/website_forum.py
+++ b/addons/website_forum/models/website_forum.py
@@ -106,7 +106,7 @@ class Post(osv.Model):
         'active': fields.boolean('Active'),
         'views': fields.integer('Page Views'),
 
-        'parent_id': fields.many2one('website.forum.post', 'Question'),
+        'parent_id': fields.many2one('website.forum.post', 'Question', ondelete='cascade'),
         'child_ids': fields.one2many('website.forum.post', 'parent_id', 'Answers'),
 
         'history_ids': fields.one2many('blog.post.history', 'post_id', 'History', help='Last post modifications'),
diff --git a/addons/website_forum/static/src/js/website_forum.editor.js b/addons/website_forum/static/src/js/website_forum.editor.js
index b79b0d4df37..0dd7f880b69 100644
--- a/addons/website_forum/static/src/js/website_forum.editor.js
+++ b/addons/website_forum/static/src/js/website_forum.editor.js
@@ -55,4 +55,17 @@ $(document).ready(function () {
             });
         return false;
     });
+
+    $('.delete').on('click', function (ev) {
+        ev.preventDefault();
+        var $link = $(ev.currentTarget);
+        var value = $link.attr("value")
+        openerp.jsonRpc("/forum/post_delete/", 'call', {
+                'post_id': $link.attr("id")})
+            .then(function (data) {
+                $link.parents('#answer').remove();
+            });
+        return false;
+    });
+
 });
\ No newline at end of file
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 8c2ef220c66..b31b6f32032 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -322,7 +322,7 @@
                                         </a>
                                     </li>
                                     <li><a class="text-muted" href="">edit</a></li>
-                                    <li><a class="text-muted" href="">delete</a></li>
+                                    <li><a class="text-muted" t-attf-href="/forum/#{ slug(forum) }/delete/question/#{ question.id }">delete</a></li>
                                     <li><a class="text-muted" href="">share</a></li>
                                 </ul>
                             </div>
@@ -338,7 +338,7 @@
                 </div>
                 <hr/>
 
-                <div t-foreach="question.child_ids" t-as="answer" class="mt16 mb32">
+                <div t-foreach="question.child_ids" t-as="answer" class="mt16 mb32" id="answer">
                     <div class="text-center pull-left">
                         <div t-attf-class="box oe_grey">
                             <a t-attf-class="fa fa-thumbs-up #{answer.user_vote == 1 and 'text-success' or ''}" 
@@ -365,7 +365,7 @@
                                     </a>
                                 </li>
                                 <li><a class="text-muted" href="">edit</a></li>
-                                <li><a class="text-muted" href="">delete</a></li>
+                                <li><a class="text-muted delete" href="" t-attf-id="#{answer.id}">delete</a></li>
                                 <li><a class="text-muted" href="">share</a></li>
                             </ul>
                             <t t-set="user" t-value="answer.create_uid"/>

From 009364277dcc7b54f0f363d6a6ebcf900e57a2b9 Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Wed, 12 Mar 2014 12:04:07 +0530
Subject: [PATCH 2/4] [imp]:improve edit question ans answer via menu

bzr revid: sunilsharma.sharma07@gmail.com-20140312063407-mgde3cxz5ozr095x
---
 addons/website_forum/controllers/main.py     | 33 ++++++++++++++++++++
 addons/website_forum/models/website_forum.py |  5 ++-
 addons/website_forum/views/website_forum.xml | 24 ++++++++++++--
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 98bcfd971d6..fd016a6ea72 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -350,3 +350,36 @@ class website_forum(http.Controller):
         Post = request.registry['website.forum.post']
         Post.unlink(cr, uid, [post.id], context=context)
         return werkzeug.utils.redirect("/forum/%s/" % (slug(forum)))
+
+    @http.route('/forum/<model("website.forum"):forum>/edit/question/<model("website.forum.post"):post>', type='http', auth="user", multilang=True, website=True)
+    def edit_question(self, forum, post, **kwarg):
+        cr, uid, context = request.cr, request.uid, request.context
+        Post = request.registry['website.forum.post']
+        values = {
+            'post': post,
+            'forum': forum,
+            'searches': kwarg
+        }
+        return request.website.render("website_forum.edit_question", values)
+
+    @http.route('/forum/<model("website.forum"):forum>/question/savequestion/', type='http', auth="user", multilang=True, methods=['POST'], website=True)
+    def save_edited_question(self, forum, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+        request.registry['website.forum.post'].write( cr, uid, [int(post.get('post_id'))], {
+                'content': post.get('answer_content'),
+                'name': post.get('question_name'),
+            }, context=context)
+        return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum),post.get('post_id')))
+
+    @http.route('/forum/<model("website.forum"):forum>/answer/<model("website.forum.post"):post>/edit/<model("website.forum.post"):answer>', type='http', auth="user", multilang=True, website=True)
+    def edit_ans(self, forum, post, answer, **kwarg):
+        cr, uid, context = request.cr, request.uid, request.context
+        Post = request.registry['website.forum.post']
+        values = {
+            'post': post,
+            'post_answer': answer,
+            'forum': forum,
+            'searches': kwarg
+        }
+        return request.website.render("website_forum.edit_answer", values)
+
diff --git a/addons/website_forum/models/website_forum.py b/addons/website_forum/models/website_forum.py
index a4945c16791..3dda7c1d0d2 100644
--- a/addons/website_forum/models/website_forum.py
+++ b/addons/website_forum/models/website_forum.py
@@ -168,10 +168,13 @@ class Post(osv.Model):
         if context is None:
             context = {}
         create_context = dict(context, mail_create_nolog=True)
-        post_id = super(Post, self).create(cr, uid, vals, context=create_context)
         body = "asked a question"
         if vals.get("parent_id"):
             body = "answered a question"
+            #Note: because of no name it gives error on slug so set name of question in answer
+            question = self.browse(cr, uid, vals.get("parent_id"), context=context)
+            vals['name'] = question.name
+        post_id = super(Post, self).create(cr, uid, vals, context=create_context)
         self.message_post(cr, uid, [post_id], body=body, context=context)
         return post_id
 
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index c257f34c8b8..a99ba0bf4b8 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -282,6 +282,26 @@
             </t>
         </template>
 
+        <template id="edit_question">
+            <t t-call="website_forum.header">
+                <h3>Edit question</h3>
+                <form t-attf-action="/forum/#{ slug(forum) }/question/savequestion/" method="post" role="form">
+                    <input type="text" name="question_name" required="True" t-attf-value="#{post.name or ''}"
+                        class="form-control" placeholder="Edit your Question"/>
+                    <h5 class="mt20">Please enter a descriptive question (should finish by a '?')</h5>
+                    <textarea name="answer_content" required="True" value="content" class="form-control" id="textarea_ckeditor">
+                        <t t-esc="post.content"/>
+                    </textarea>
+                    <input type="text" name="question_tag" class="form-control" style="margin-top: 10px" placeholder="Tags"/>
+                    <input name="post_id" t-att-value="post.id" type="hidden"/>
+                    <button class="btn btn-primary btn-lg">Save</button>
+                </form>
+                <script type="text/javascript">
+                    CKEDITOR.replace("answer_content");
+                </script>
+            </t>
+        </template>
+
         <template id="post_description_full" name="Question Navigation">
             <t t-call="website_forum.header">
 
@@ -321,7 +341,7 @@
                                             comment
                                         </a>
                                     </li>
-                                    <li><a class="text-muted" href="">edit</a></li>
+                                    <li><a class="text-muted" t-attf-href="/forum/#{ slug(forum) }/edit/question/#{ question.id }">edit</a></li>
                                     <li><a class="text-muted" t-attf-href="/forum/#{ slug(forum) }/delete/question/#{ question.id }">delete</a></li>
                                     <li><a class="text-muted" href="">share</a></li>
                                 </ul>
@@ -364,7 +384,7 @@
                                         comment
                                     </a>
                                 </li>
-                                <li><a class="text-muted" href="">edit</a></li>
+                                <li><a class="text-muted" t-attf-href="/forum/#{ slug(forum) }/answer/#{ question.id }/edit/#{ answer.id }">edit</a></li>
                                 <li><a class="text-muted delete" href="" t-attf-id="#{answer.id}">delete</a></li>
                                 <li><a class="text-muted" href="">share</a></li>
                             </ul>

From 12a070dbbeb540bc16f767e9a1453475c70a10ff Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Wed, 12 Mar 2014 17:35:44 +0530
Subject: [PATCH 3/4] [imp]:improve user chose correct answer

bzr revid: sunilsharma.sharma07@gmail.com-20140312120544-t3j2o5hrb226axfu
---
 addons/website_forum/controllers/main.py        | 11 +++++++++++
 addons/website_forum/models/website_forum.py    |  1 +
 .../static/src/css/website_forum.css            |  8 ++++++++
 .../static/src/js/website_forum.editor.js       | 17 ++++++++++++++++-
 addons/website_forum/views/website_forum.xml    |  5 +++--
 5 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index fd016a6ea72..efdd0bebc72 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -383,3 +383,14 @@ class website_forum(http.Controller):
         }
         return request.website.render("website_forum.edit_answer", values)
 
+    @http.route('/forum/correct_answer/', type='json', auth="user", multilang=True, methods=['POST'], website=True)
+    def correct_answer(self, **kwarg):
+        cr, uid, context = request.cr, request.uid, request.context
+        Post = request.registry['website.forum.post']
+        post = Post.browse(cr, uid, int(kwarg.get('post_id')), context=context)
+        if post.create_uid.id == uid:
+            correct = False if post.correct else True
+            Post.write( cr, uid, [int(kwarg.get('post_id'))], {
+                'correct': correct,
+            }, context=context)
+        return correct
diff --git a/addons/website_forum/models/website_forum.py b/addons/website_forum/models/website_forum.py
index 3dda7c1d0d2..0b0fffb24c8 100644
--- a/addons/website_forum/models/website_forum.py
+++ b/addons/website_forum/models/website_forum.py
@@ -139,6 +139,7 @@ class Post(osv.Model):
                 'website.forum.post.vote': (_get_vote, [], 10),
             }
         ),
+        'correct': fields.boolean('Correct Answer'),
     }
     _defaults = {
         'state': 'active',
diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index 26fee8e1f10..b88ab71619b 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -36,3 +36,11 @@
 .badge-bronze {
   color: #eea91e;
 }
+
+.oe_answer_true {
+  color: #428bca;
+}
+
+.oe_answer_false {
+  color: #999
+}
diff --git a/addons/website_forum/static/src/js/website_forum.editor.js b/addons/website_forum/static/src/js/website_forum.editor.js
index 0dd7f880b69..d54558a277c 100644
--- a/addons/website_forum/static/src/js/website_forum.editor.js
+++ b/addons/website_forum/static/src/js/website_forum.editor.js
@@ -59,7 +59,6 @@ $(document).ready(function () {
     $('.delete').on('click', function (ev) {
         ev.preventDefault();
         var $link = $(ev.currentTarget);
-        var value = $link.attr("value")
         openerp.jsonRpc("/forum/post_delete/", 'call', {
                 'post_id': $link.attr("id")})
             .then(function (data) {
@@ -67,5 +66,21 @@ $(document).ready(function () {
             });
         return false;
     });
+    
+    $('.fa-check').on('click', function (ev) {
+        ev.preventDefault();
+        var $link = $(ev.currentTarget);
+        openerp.jsonRpc("/forum/correct_answer/", 'call', {
+                'post_id': $link.attr("id")})
+              .then(function (data) {
+                  if (data) {
+                    $link.removeClass("oe_answer_false").addClass('oe_answer_true');
+                  }
+                  else {
+                    $link.removeClass("oe_answer_true").addClass('oe_answer_false');
+                  }
+             });
+        return false;
+    });
 
 });
\ No newline at end of file
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index a99ba0bf4b8..fcb14682a5f 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -370,8 +370,9 @@
                                 votes
                             </div>
                         </div>
-                        <div class="text-muted">
-                            <a href="#" class="fa fa-2x fa-check"/>
+                        <div class="text-muted" id="correct">
+                            <a t-attf-id="#{answer.id}" t-if="answer.correct" class="fa fa-2x fa-check oe_answer_true"/>
+                            <a t-attf-id="#{answer.id}" t-if="not answer.correct" class="fa fa-2x fa-check oe_answer_false"/>
                         </div>
                     </div>
                     <div style="margin-left: 95px;" class="clearfix">

From e17bb59dd0d10efa98a4d5dbf637a8abe8b48eeb Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP)" <sunilsharma.sharma07@gmail.com>
Date: Wed, 12 Mar 2014 17:52:28 +0530
Subject: [PATCH 4/4] [imp]:improve some code

bzr revid: sunilsharma.sharma07@gmail.com-20140312122228-lxh5oqenkddkhtq2
---
 addons/website_forum/views/website_forum.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 336c4c35ba7..7cf3c4febaa 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -373,9 +373,9 @@
                                 votes
                             </div>
                         </div>
-                        <div class="text-muted" id="correct">
-                            <a href="" t-attf-id="#{answer.id}" t-if="answer.correct" class="fa fa-2x fa-check oe_answer_true"/>
-                            <a href="" t-attf-id="#{answer.id}" t-if="not answer.correct" class="fa fa-2x fa-check oe_answer_false"/>
+                        <div class="text-muted">
+                            <a t-attf-id="#{answer.id}" t-if="answer.correct" class="fa fa-2x fa-check oe_answer_true"/>
+                            <a t-attf-id="#{answer.id}" t-if="not answer.correct" class="fa fa-2x fa-check oe_answer_false"/>
                         </div>
                     </div>
                     <div style="margin-left: 95px;" class="clearfix">