fixing issue with admin page

mdeiters · mdeiters · commit 16df4600df2f · 2016-06-08T16:09:36.000-07:00
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
@@ -6,7 +6,7 @@ def index
       format.html {
         # TODO: do we need this check?
         return head(:forbidden) unless admin?
-        @comments = Comment.order(created_at: :desc).page(params[:page])
+        @comments = Comment.on_protips.order(created_at: :desc).page(params[:page])
       }
       format.json {
         @comments = Comment.
diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -14,6 +14,7 @@ class Comment < ActiveRecord::Base
   validates :body,   length: { minimum: 2 }
 
   scope :recently_created, ->(count=10) { order(created_at: :desc).limit(count)}
+  scope :on_protips, -> { joins(:article).where(protips: {type: 'Protip'}) }
 
   def dom_id
     ActionView::RecordIdentifier.dom_id(self)
diff --git a/app/views/comments/index.html.haml b/app/views/comments/index.html.haml
@@ -4,7 +4,7 @@
     .sm-col.sm-col.sm-col-12.md-col-8
       -@comments.each do |comment|
         %h6.mt1
-          =link_to comment.protip.title, protip_path(comment.protip)
+          =link_to comment.article.title, protip_path(comment.article)
         =render comment
         .bold.mb4
           =link_to("Delete #{comment.user.username} and their #{comment.user.comments.size} comments", user_path(comment.user), method: :delete, class: 'diminish mr1')

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ def index`
`6`	`6`	`format.html {`
`7`	`7`	`# TODO: do we need this check?`
`8`	`8`	`return head(:forbidden) unless admin?`
`9`		`- @comments = Comment.order(created_at: :desc).page(params[:page])`
	`9`	`+ @comments = Comment.on_protips.order(created_at: :desc).page(params[:page])`
`10`	`10`	`}`
`11`	`11`	`format.json {`
`12`	`12`	`@comments = Comment.`