From b104859da322b4fdb22e66dd9e2d78ed8d8633d3 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Wed, 16 Nov 2016 19:41:52 +0100
Subject: [PATCH] adds question comments

---
 app/models/abilities/administrator.rb        |  2 +-
 app/models/abilities/moderator.rb            |  2 +-
 app/models/comment.rb                        |  4 +--
 app/views/polls/questions/_comments.html.erb | 31 ++++++++++++++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 app/views/polls/questions/_comments.html.erb

diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb
index a0e040ab3..79999cd04 100644
--- a/app/models/abilities/administrator.rb
+++ b/app/models/abilities/administrator.rb
@@ -33,7 +33,7 @@ module Abilities
       can :mark_featured, Debate
       can :unmark_featured, Debate
 
-      can :comment_as_administrator, [Debate, Comment, Proposal]
+      can :comment_as_administrator, [Debate, Comment, Proposal, Poll::Question]
 
       can [:search, :create, :index, :destroy], ::Moderator
       can [:search, :create, :index, :summary], ::Valuator
diff --git a/app/models/abilities/moderator.rb b/app/models/abilities/moderator.rb
index f6c5c5004..634002933 100644
--- a/app/models/abilities/moderator.rb
+++ b/app/models/abilities/moderator.rb
@@ -5,7 +5,7 @@ module Abilities
     def initialize(user)
       self.merge Abilities::Moderation.new(user)
 
-      can :comment_as_moderator, [Debate, Comment, Proposal]
+      can :comment_as_moderator, [Debate, Comment, Proposal, Poll::Question]
     end
   end
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 47beb5050..b666b354a 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -10,7 +10,7 @@ class Comment < ActiveRecord::Base
 
   validates :body, presence: true
   validates :user, presence: true
-  validates_inclusion_of :commentable_type, in: ["Debate", "Proposal"]
+  validates_inclusion_of :commentable_type, in: ["Debate", "Proposal", "Poll::Question"]
 
   validate :validate_body_length
 
@@ -95,7 +95,7 @@ class Comment < ActiveRecord::Base
   end
 
   def self.body_max_length
-    Setting['comments_body_max_length'].to_i 
+    Setting['comments_body_max_length'].to_i
   end
 
   def calculate_confidence_score
diff --git a/app/views/polls/questions/_comments.html.erb b/app/views/polls/questions/_comments.html.erb
new file mode 100644
index 000000000..a967406aa
--- /dev/null
+++ b/app/views/polls/questions/_comments.html.erb
@@ -0,0 +1,31 @@
+<% cache [locale_and_user_status, @current_order, commentable_cache_key(@commentable), @comment_tree.comments, @comment_tree.comment_authors, @commentable.comments_count, @comment_flags] do %>
+  <section class="row-full comments">
+    <div class="row">
+      <div id="comments" class="small-12 column">
+        <h2>
+          <%= t("shared.comments.title") %>
+          <span class="js-comments-count">(<%= @commentable.comments_count %>)</span>
+        </h2>
+
+        <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
+
+        <% if user_signed_in? %>
+          <%= render 'comments/form', {commentable: @commentable, parent_id: nil, toggeable: false} %>
+        <% else %>
+        <br>
+
+        <div data-alert class="callout primary">
+          <%= t("shared.comments.login_to_comment",
+              signin: link_to(t("votes.signin"), new_user_session_path),
+              signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+          </div>
+        <% end %>
+
+        <% @comment_tree.root_comments.each do |comment| %>
+          <%= render 'comments/comment', comment: comment  %>
+        <% end %>
+        <%= paginate @comment_tree.root_comments %>
+      </div>
+    </div>
+  </section>
+<% end %>
\ No newline at end of file