Unwind the set_issues method

[rails.git] / app / controllers / issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 181d176abc87e18f6e44ef6c305e63ab069bf5df..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,47 +81,14 @@ class IssuesController < ApplicationController
 
   private
 
-  def set_issues
-    @admin_issues = %w[DiaryEntry DiaryComment User]
-    @moderator_issues = %w[Note]
-  end
-
-  def check_if_updated
-    if @issue.reportable && (@issue.ignored? || @issue.resolved?) && @issue.reportable.has_attribute?(:updated_by) && @issue.reportable.updated_at > @last_report.updated_at
-      true
-    else
-      false
-    end
-  end
-
   def find_issue
     @issue = Issue.find(params[:id])
   end
 
   def check_permission
     unless current_user.administrator? || current_user.moderator?
-      flash[:error] = t("application.require_admin.not_an_admin")
+      flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_admin")
       redirect_to root_path
     end
   end
-
-  def issue_params
-    params[:issue].permit(:reportable_id, :reportable_type)
-  end
-
-  def report_params
-    params[:report].permit(:details)
-  end
-
-  def issue_comment_params
-    params.require(:issue_comment).permit(:body)
-  end
-
-  def sort_column
-    Issue.column_names.include?(params[:sort]) ? params[:sort] : "status"
-  end
-
-  def sort_direction
-    %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
-  end
 end