added logic for available conferences based on roles in comments_controller.rb

app/controllers/admin/comments_controller.rb

@@ -1,11 +1,9 @@
 module Admin
   class CommentsController < Admin::BaseController
-    load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource
 
-
     def index
-      @ordered_events = Event.order(:title).all
+      @conferences_available = Conference.with_roles([:admin, :organizer, :cfp], current_user)
     end
   end
 end

app/views/admin/comments/_all_comments.html.haml

@@ -1,12 +1,14 @@
 .panel.well
-  -@ordered_events.each do |event|
+  -@conferences_available.each do |conference|
+    -conference.events.each do |event|
       - if event.comment_threads.count > 0
         %panel
           %panel.panel-header
             %h4.title
               = link_to event.title, admin_conference_event_path(event.conference.short_title, event)
+              = conference.title
             %hr
-        -event.comment_threads.order(created_at: :desc).each do |comment|
+          -event.comment_threads.each do |comment|
             %panel-body
               %ul.list-unstyled
                 %li= comment.body

app/views/admin/comments/_posted_comments.html.haml

@@ -1,10 +1,12 @@
 .panel.well
-  -@ordered_events.each do |event|
+  -@conferences_available.each do |conference|
+    -conference.events.each do |event|
       - if event.comment_threads.find_comments_by_user(current_user).count > 0
         %panel
           %panel.panel-header
             %h4.title
               = link_to event.title, admin_conference_event_path(event.conference.short_title, event)
+              = conference.title
             %hr
           -event.comment_threads.find_comments_by_user(current_user).each do |comment|
             %panel-body

app/views/admin/comments/_unread_comments.html.haml

@@ -1,10 +1,12 @@
 .panel.well
-  -@ordered_events.each do |event|
+  -@conferences_available.each do |conference|
+    -conference.events.each do |event|
       - if event.comment_threads.find_since_last_login(current_user).count > 0
         %panel
           %panel.panel-header
             %h4.title
               = link_to event.title, admin_conference_event_path(event.conference.short_title, event)
+              = conference.title
             %hr
           -event.comment_threads.find_since_last_login(current_user).each do |comment|
             %panel-body