X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/508bb04f213e94c006892ef319ca9443334b2adf..de29e9b3f59d7a06fbe2e32096328bd8a6ed2b3a:/app/controllers/issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 362100e6a..ad38454f0 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -2,44 +2,40 @@ class IssuesController < ApplicationController
   layout "site"
 
   before_action :authorize_web
+  before_action :set_locale
   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?
 
-    @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
 
-    @issues = @issues.where(:status => params[:status][0]) if params[:status] && params[:status][0].present?
+    @issues = @issues.where(:status => params[:status]) if params[:status]&.present?
 
-    @issues = @issues.where(:reportable_type => params[:issue_type][0]) if params[:issue_type] && params[:issue_type][0].present?
+    @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type]&.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
+    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
-
-    redirect_to issues_path, :notice => notice if notice
   end
 
   def show
@@ -54,7 +50,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
@@ -64,7 +60,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
@@ -74,7 +70,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
@@ -82,18 +78,13 @@ class IssuesController < ApplicationController
 
   private
 
-  def set_issues
-    @admin_issues = %w[DiaryEntry DiaryComment User]
-    @moderator_issues = %w[Note]
-  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