X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cf639202b802be9ce1a6f3f65e7d4f6292a2ad3a..206e1309a95b498a220d8de6cf4ed5970ebd6778:/app/controllers/issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 550140232..beb1425cd 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -5,15 +5,9 @@ class IssuesController < ApplicationController
   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 :get_user_role, only: [:show, :index]
 
   def index
-    # Get user role
-    if @user.administrator?
-      @user_role = "administrator"
-    else
-      @user_role = "moderator"
-    end
-
     # If search
     if params[:search_by_user]
       @find_user = User.find_by_display_name(params[:search_by_user])
@@ -42,7 +36,7 @@ class IssuesController < ApplicationController
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments
-    @related_issues = @issue.user.issues
+    @related_issues = @issue.user.issues.where(issue_type: @user_role)
     if @issue.updated_by
       @updated_by_admin = User.find(@issue.updated_by)
     end
@@ -60,7 +54,7 @@ class IssuesController < ApplicationController
 
     # TODO: Find better place to add these
     admin_issues = [ 'DiaryEntry', 'DiaryComment', 'User']
-    moderator_issues = []
+    moderator_issues = [ 'Changeset' ]
 
     
     @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type])
@@ -68,16 +62,18 @@ class IssuesController < ApplicationController
     if !@issue 
       @issue = Issue.find_or_initialize_by(issue_params)
       @issue.updated_by = nil
-      @admins = UserRole.where(role: "administrator")
-      @admins.each do |admin|
-        Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now
-      end
 
       # Reassign to moderators if it is a moderator issue
       @issue.issue_type = "administrator"
       if moderator_issues.include? @issue.reportable.class.name
         reassign_issue
       end
+
+      @admins_or_mods = UserRole.where(role: @issue.issue_type)
+      @admins_or_mods.each do |user|
+        Notifier.new_issue_notification(User.find(user.user_id)).deliver_now
+      end
+
     end
 
     # Check if details provided are sufficient
@@ -198,6 +194,15 @@ class IssuesController < ApplicationController
 
   private
 
+    def get_user_role
+      # Get user role
+      if @user.administrator?
+        @user_role = "administrator"
+      else
+        @user_role = "moderator"
+      end      
+    end
+    
     def check_if_updated
       if @issue.reportable and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at
         return true