X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/80a241f7985fec6ec853e48a25823446b59b7682..508bb04f213e94c006892ef319ca9443334b2adf:/app/controllers/issues_controller.rb diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index dc04606f7..362100e6a 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -30,13 +30,9 @@ class IssuesController < ApplicationController end end - if params[:status] && params[:status][0].present? - @issues = @issues.where(:status => params[:status][0]) - 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 @@ -88,15 +84,7 @@ class IssuesController < ApplicationController 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 + @moderator_issues = %w[Note] end def find_issue @@ -109,24 +97,4 @@ class IssuesController < ApplicationController 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