From 6bcffbf49970b6d8c27f2a9561eec365aa590ea9 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 14 Mar 2018 16:34:19 +0800 Subject: [PATCH 1/1] Unwind the set_issues method --- app/controllers/issues_controller.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index dfaff63b1..10b626cd1 100644 --- 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 -- 2.43.2