X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/79bd1777ab0c165492122b10a22ecc2fb7cc4715..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/controllers/issues_controller.rb?ds=sidebyside diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 75eb3dd3a..d136e7230 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -2,61 +2,48 @@ class IssuesController < ApplicationController layout "site" before_action :authorize_web - before_action :require_user - before_action :set_issues - before_action :check_permission + before_action :set_locale + + authorize_resource + 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? - @issues = Issue.where(:assigned_role => current_user.roles.map(&:role)) + @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct + @issues = Issue.visible_to(current_user) # If search - if params[:search_by_user] && params[:search_by_user].present? + if params[:search_by_user]&.present? @find_user = User.find_by(:display_name => params[:search_by_user]) if @find_user @issues = @issues.where(:reported_user_id => @find_user.id) else - notice = t("issues.index.user_not_found") + @issues = @issues.none + flash.now[:warning] = t(".user_not_found") 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]) if params[:status]&.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]) if params[:issue_type]&.present? - # If last_updated_by - 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 + if params[:last_updated_by]&.present? + last_updated_by = params[:last_updated_by].to_s == "nil" ? nil : params[:last_updated_by].to_i @issues = @issues.where(:updated_by => last_updated_by) end - - if params[:last_reported_by] && params[:last_reported_by][0].present? - last_reported_by = params[:last_reported_by][0].to_s == "nil" ? nil : params[:last_reported_by][0].to_i - @issues = @issues.where(:updated_by => last_reported_by) - end - - redirect_to issues_path, :notice => notice if notice end def show @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 @@ -64,7 +51,7 @@ class IssuesController < ApplicationController def resolve if @issue.resolve @issue.save! - redirect_to @issue, :notice => t("issues.resolved") + redirect_to @issue, :notice => t(".resolved") else render :show end @@ -74,7 +61,7 @@ class IssuesController < ApplicationController if @issue.ignore @issue.updated_by = current_user.id @issue.save! - redirect_to @issue, :notice => t("issues.ignored") + redirect_to @issue, :notice => t(".ignored") else render :show end @@ -84,7 +71,7 @@ class IssuesController < ApplicationController if @issue.reopen @issue.updated_by = current_user.id @issue.save! - redirect_to @issue, :notice => t("issues.reopened") + redirect_to @issue, :notice => t(".reopened") else render :show end @@ -92,47 +79,9 @@ 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") - 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" + @issue = Issue.visible_to(current_user).find(params[:id]) + rescue ActiveRecord::RecordNotFound + head :not_found end end