From 1efa1b3169d0bff136e32048b5d15d079badadec Mon Sep 17 00:00:00 2001
From: Waqas Khalid <waqas.khalid@arbisoft.com>
Date: Tue, 16 Sep 2014 17:24:20 +0500
Subject: [PATCH] Don't allow voting while the thread is closed

When someone closes thread there is still option
to add vote which cause error when click on add
vote button. User shouldn't be able to add vote
while the thread is closed.

TNL-152
---
 .../discussion/discussion_spec_helper.coffee  |  5 ++++-
 .../view/discussion_thread_view_spec.coffee   | 21 ++++++++++++++++++-
 .../view/discussion_view_spec_helper.coffee   |  2 +-
 .../views/discussion_content_view.coffee      | 14 ++++++-------
 .../views/discussion_thread_view.coffee       |  4 ++++
 .../discussion/_underscore_templates.html     |  5 ++++-
 6 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee b/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
index d1a3de530a..5d693794c9 100644
--- a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
+++ b/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
@@ -470,12 +470,15 @@ browser and pasting the output.  When that file changes, this one should be rege
 
 <script type="text/template" id="forum-action-vote">
     <li class="actions-item">
+        <span aria-hidden="true" class="display-vote" style="display: none;">
+          <span class="vote-count"></span>
+        </span>
         <a href="#" class="action-button action-vote" role="checkbox" aria-checked="false">
             <span class="sr">Vote</span>
             <span class="sr js-sr-vote-count"></span>
 
             <span class="action-label" aria-hidden="true">
-              <span class="js-visual-vote-count"></span>
+              <span class="vote-count"></span>
             </span>
 
             <span class="action-icon" aria-hidden="true">
diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_view_spec.coffee b/common/static/coffee/spec/discussion/view/discussion_thread_view_spec.coffee
index 42b5b97551..6757d000f2 100644
--- a/common/static/coffee/spec/discussion/view/discussion_thread_view_spec.coffee
+++ b/common/static/coffee/spec/discussion/view/discussion_thread_view_spec.coffee
@@ -43,7 +43,8 @@ describe "DiscussionThreadView", ->
             expect(view.$el.find(".load-response-button").length).toEqual(0)
 
     describe "closed and open Threads", ->
-        checkCommentForm = (originallyClosed, mode) ->
+
+        createDiscussionThreadView = (originallyClosed, mode) ->
             threadData = DiscussionViewSpecHelper.makeThreadWithProps({closed: originallyClosed})
             thread = new Thread(threadData)
             discussion = new Discussion(thread)
@@ -60,18 +61,36 @@ describe "DiscussionThreadView", ->
               (model, updates, safeAjaxParams, errorMsg) ->
                 model.set(updates)
             )
+            view
+
+        checkCommentForm = (originallyClosed, mode) ->
+            view = createDiscussionThreadView(originallyClosed, mode)
             expect(view.$('.comment-form').closest('li').is(":visible")).toBe(not originallyClosed)
             expect(view.$(".discussion-reply-new").is(":visible")).toBe(not originallyClosed)
             view.$(".action-close").click()
             expect(view.$('.comment-form').closest('li').is(":visible")).toBe(originallyClosed)
             expect(view.$(".discussion-reply-new").is(":visible")).toBe(originallyClosed)
 
+        checkVoteDisplay = (originallyClosed, mode) ->
+            view = createDiscussionThreadView(originallyClosed, mode)
+            expect(view.$('.action-vote').is(":visible")).toBe(not originallyClosed)
+            expect(view.$('.display-vote').is(":visible")).toBe(originallyClosed)
+            view.$(".action-close").click()
+            expect(view.$('.action-vote').is(":visible")).toBe(originallyClosed)
+            expect(view.$('.display-vote').is(":visible")).toBe(not originallyClosed)
+
         _.each(["tab", "inline"], (mode) =>
                 it 'Test that in #{mode} mode when a closed thread is opened the comment form is displayed', ->
                         checkCommentForm(true, mode)
 
                 it 'Test that in #{mode} mode when a open thread is closed the comment form is hidden', ->
                         checkCommentForm(false, mode)
+
+                it 'Test that in #{mode} mode when a closed thread is opened the vote button is displayed and vote count is hidden', ->
+                        checkVoteDisplay(true, mode)
+
+                it 'Test that in #{mode} mode when a open thread is closed the vote button is hidden and vote count is displayed', ->
+                        checkVoteDisplay(false, mode)
         )
 
     describe "tab mode", ->
diff --git a/common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee b/common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee
index 2afd95af81..b53f1612f4 100644
--- a/common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee
+++ b/common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee
@@ -21,7 +21,7 @@ class @DiscussionViewSpecHelper
         button = view.$el.find(".action-vote")
         expect(button.hasClass("is-checked")).toBe(user.voted(model))
         expect(button.attr("aria-checked")).toEqual(user.voted(model).toString())
-        expect(button.find(".js-visual-vote-count").text()).toMatch("^#{model.get('votes').up_count} Votes?$")
+        expect(button.find(".vote-count").text()).toMatch("^#{model.get('votes').up_count} Votes?$")
         expect(button.find(".sr.js-sr-vote-count").text()).toMatch("^currently #{model.get('votes').up_count} votes?$")
 
     @checkRenderVote = (view, model) ->
diff --git a/common/static/coffee/src/discussion/views/discussion_content_view.coffee b/common/static/coffee/src/discussion/views/discussion_content_view.coffee
index a481e2368b..8c075f6902 100644
--- a/common/static/coffee/src/discussion/views/discussion_content_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_content_view.coffee
@@ -118,13 +118,13 @@ if Backbone?
             true
           )
         )
-        button.find(".js-visual-vote-count").html(
-          interpolate(
-            ngettext("%(numVotes)s Vote", "%(numVotes)s Votes", numVotes),
-            {numVotes: numVotes},
-            true
-          )
-        )
+        votesHtml = interpolate(
+                      ngettext("%(numVotes)s Vote", "%(numVotes)s Votes", numVotes),
+                      {numVotes: numVotes},
+                      true
+                    )
+        button.find(".vote-count").html(votesHtml)
+        @$el.find('.display-vote .vote-count').html(votesHtml)
 
       pinned: (pinned) ->
         @updateButtonState(".action-pin", pinned)
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_view.coffee
index 97346949c9..f8af5dd359 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_view.coffee
@@ -77,6 +77,9 @@ if Backbone?
       closed: (closed) ->
         @$(".discussion-reply-new").toggle(not closed)
         @$('.comment-form').closest('li').toggle(not closed)
+        @$(".action-vote").toggle(not closed)
+        @$(".display-vote").toggle(closed)
+#        @$(".display-vote").toggle(closed)
         @renderAddResponseButton()
     })
 
@@ -309,6 +312,7 @@ if Backbone?
     closeEditView: (event) =>
       @createShowView()
       @renderShowView()
+      @renderAttrs()
       # next call is necessary to re-render the post action controls after
       # submitting or cancelling a thread edit in inline mode.
       @$el.find(".post-extended-content").show()
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index 1e36c0fc9b..f1872de3ca 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -518,13 +518,16 @@ ${primaryAction("follow", "star", _("Follow"), _("Follow"), _("Unfollow"))}
 
 <script type="text/template" id="forum-action-vote">
     <li class="actions-item">
+        <span aria-hidden="true" class="display-vote" >
+          <span class="vote-count"></span>
+        </span>
         <a href="#" class="action-button action-vote" role="checkbox" aria-checked="false">
             ## Vote counts are populated by JS
             <span class="sr">${_("Vote")}</span>
             <span class="sr js-sr-vote-count"></span>
 
             <span class="action-label" aria-hidden="true">
-              <span class="js-visual-vote-count"></span>
+              <span class="vote-count"></span>
             </span>
 
             <span class="action-icon" aria-hidden="true">