X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7b5e0d91f3c98e593f939225646f60f246af27f0..85bf9adb91df1944560d5a81a21fec4201d8d722:/app/controllers/issues_controller.rb diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 7f455b9e9..6f4667a30 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -3,21 +3,17 @@ 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] def index @title = t ".title" - if current_user.moderator? - @issue_types = @moderator_issues - @users = User.joins(:roles).where(:user_roles => { :role => "moderator" }) - else - @issue_types = @admin_issues - @users = User.joins(:roles).where(:user_roles => { :role => "administrator" }) - end + @issue_types = [] + @issue_types.concat %w[Note] if current_user.moderator? + @issue_types.concat %w[DiaryEntry DiaryComment User] if current_user.administrator? + @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct @issues = Issue.where(:assigned_role => current_user.roles.map(&:role)) # If search @@ -30,13 +26,9 @@ class IssuesController < ApplicationController end end - if params[:status] && params[:status][0].present? - @issues = @issues.where(:status => params[:status][0].to_i) - end + @issues = @issues.where(:status => params[:status][0]) if params[:status] && params[:status][0].present? - if params[:issue_type] && params[:issue_type][0].present? - @issues = @issues.where(:reportable_type => params[:issue_type][0]) - end + @issues = @issues.where(:reportable_type => params[:issue_type][0]) if params[:issue_type] && params[:issue_type][0].present? if params[:last_updated_by] && params[:last_updated_by][0].present? last_updated_by = params[:last_updated_by][0].to_s == "nil" ? nil : params[:last_updated_by][0].to_i @@ -50,7 +42,7 @@ class IssuesController < ApplicationController @read_reports = @issue.read_reports @unread_reports = @issue.unread_reports @comments = @issue.comments - @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role)) + @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role)) if @issue.reported_user @new_comment = IssueComment.new(:issue => @issue) end @@ -86,47 +78,14 @@ class IssuesController < ApplicationController private - def set_issues - @admin_issues = %w[DiaryEntry DiaryComment User] - @moderator_issues = %w[Changeset 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