X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/683722ed5c1b3224a04c23b4d175a0638964f713..e4c40cbd36567d050f1b779f1444c4ef26c50a5b:/app/controllers/issues_controller.rb?ds=inline diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index a00423a51..594038939 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -2,58 +2,57 @@ class IssuesController < ApplicationController layout "site" before_action :authorize_web - before_action :require_user - before_action :check_permission, only: [:index, :show, :resolve,:open,:ignore,:comment] - before_action :find_issue, only: [:show, :resolve, :reopen, :ignore] + before_action :set_locale - def index - @issues = Issue.all - end - - def show - @read_reports = @issue.read_reports - @unread_reports = @issue.unread_reports - @comments = @issue.comments - end + authorize_resource - def new - unless create_new_issue_params.blank? - @issue = Issue.find_or_initialize_by(create_new_issue_params) - puts params[:user_id].to_s + "--------------" - end - end + before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore] - def create - @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type]) - if !@issue - @issue = Issue.find_or_initialize_by(issue_params) - @admins = UserRole.where(role: "administrator") - @admins.each do |admin| - Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now + def index + @title = t ".title" + + @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.visible_to(current_user) + + # If search + 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 + @issues = @issues.none + flash.now[:warning] = t(".user_not_found") end end - @report = @issue.reports.build(report_params) - @report.user_id = @user.id - if @issue.save! - redirect_to root_path, notice: 'Issue was successfully created.' - else - render :new + + @issues = @issues.where(:status => params[:status]) if params[:status]&.present? + + @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type]&.present? + + 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 end - def comment - @issue = Issue.find(params[:id]) - @issue_comment = @issue.comments.build(issue_comment_params) - @issue_comment.user_id = @user.id - @issue_comment.save! - redirect_to @issue + 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)) if @issue.reported_user + @new_comment = IssueComment.new(:issue => @issue) end - # Status Transistions + # Status Transitions def resolve if @issue.resolve + @issue.updated_by = current_user.id @issue.save! - redirect_to @issue, notice: "Issue status has been set to: 'Resolved'" + redirect_to @issue, :notice => t(".resolved") else render :show end @@ -61,8 +60,9 @@ class IssuesController < ApplicationController def ignore if @issue.ignore + @issue.updated_by = current_user.id @issue.save! - redirect_to @issue, notice: "Issue status has been set to: 'Ignored'" + redirect_to @issue, :notice => t(".ignored") else render :show end @@ -70,8 +70,9 @@ class IssuesController < ApplicationController def reopen if @issue.reopen + @issue.updated_by = current_user.id @issue.save! - redirect_to @issue, notice: "Issue status has been set to: 'Open'" + redirect_to @issue, :notice => t(".reopened") else render :show end @@ -79,30 +80,9 @@ class IssuesController < ApplicationController private - def find_issue - @issue = Issue.find(params[:id]) - end - - def check_permission - unless @user.administrator? - flash[:error] = t("application.require_admin.not_an_admin") - redirect_to root_path - end - end - - def create_new_issue_params - params.permit(:reportable_id, :reportable_type, :user_id) - end - - def issue_params - params.permit(:reportable_id, :reportable_type,:user_id) - end - - def report_params - params[:report].permit(:details) - end - - def issue_comment_params - params.require(:issue_comment).permit(:body, :user_id) - end + def find_issue + @issue = Issue.visible_to(current_user).find(params[:id]) + rescue ActiveRecord::RecordNotFound + redirect_to :controller => "errors", :action => "not_found" + end end