Unwind the set_issues method

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index dfaff63b1a2bdc72d87a8d4d34532e2662dd41bb..10b626cd1fc0c7bcfd3dc6568c9bab5f9329337b 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -3,7 +3,6 @@ class IssuesController < ApplicationController
 
   before_action :authorize_web
   before_action :require_user
-  before_action :set_issues
   before_action :check_permission
   before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
 
@@ -11,10 +10,10 @@ class IssuesController < ApplicationController
     @title = t ".title"
 
     if current_user.moderator?
-      @issue_types = @moderator_issues
+      @issue_types = %w[Note]
       @users = User.joins(:roles).where(:user_roles => { :role => "moderator" })
     else
-      @issue_types = @admin_issues
+      @issue_types = %w[DiaryEntry DiaryComment User]
       @users = User.joins(:roles).where(:user_roles => { :role => "administrator" })
     end
 
@@ -82,11 +81,6 @@ class IssuesController < ApplicationController
 
   private
 
-  def set_issues
-    @admin_issues = %w[DiaryEntry DiaryComment User]
-    @moderator_issues = %w[Note]
-  end
-
   def find_issue
     @issue = Issue.find(params[:id])
   end