extract protip comments to partial

seuros · seuros · commit 6b2ef7a8855a · 2015-07-26T13:16:26.000+01:00
diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -34,6 +34,8 @@ class Comment < ActiveRecord::Base
 
   belongs_to :user, autosave: true
 
+  scope :showable, ->{ with_states(:active,:reported_as_spam) }
+
   alias_method :author, :user
   alias_attribute :body, :comment
 
diff --git a/app/views/protips/_protip.html.haml b/app/views/protips/_protip.html.haml
@@ -104,15 +104,7 @@
       %div.tip-content{itemprop: :articleBody}
         = raw sanitize(protip.to_html)
 
-    - if include_comments
-      %section.comments{ class:('no-comments' if protip.comments.empty? ) }
-        - if protip.comments.any?
-          %h2.comments-header
-            %i.fa.fa-comments
-            Comments
-          %ul.comment-list
-            = render protip.comments.with_states(:active,:reported_as_spam)
-        = render 'comments/add_comment'
+    = render('protip_comments', comments: protip.comments.showable) if include_comments
 
     - if defined?(:job) && !job.nil?
       .mobile-job
diff --git a/app/views/protips/_protip_comments.slim b/app/views/protips/_protip_comments.slim
@@ -0,0 +1,8 @@
+section.comments class=('no-comments' if comments.empty? )
+  - if comments.any?
+    h2.comments-header
+      i.fa.fa-comments
+      | Comments
+    ul.comment-list
+      = render comments
+  = render 'comments/add_comment'
