X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e74163d036a0520de62667b2e77ffbe66bc7c72d..b17f9a61576d9bd1fce0848e7983b495919828fb:/app/controllers/issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index dc357a6ae..49984b804 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -52,7 +52,7 @@ class IssuesController < ApplicationController
     unless create_new_issue_params.blank?
       @issue = Issue.find_or_initialize_by(create_new_issue_params)
       path = 'issues.report_strings.' + @issue.reportable.class.name.to_s
-      @report_strings_yaml = t( path)
+      @report_strings_yaml = t(path)
     end
   end
 
@@ -60,7 +60,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 +68,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
@@ -139,16 +141,21 @@ class IssuesController < ApplicationController
 
   def comment
     @issue = Issue.find(params[:id])
-    @issue_comment = @issue.comments.build(issue_comment_params)
-    @issue_comment.commenter_user_id = @user.id
-    if params[:reassign]
-      reassign_issue
-      @issue_comment.reassign = true
-    end
-    @issue_comment.save!
-    @issue.updated_by = @user.id
-    @issue.save!
-    redirect_to @issue
+    if issue_comment_params.blank?
+      notice = t('issues.comment.provide_details')
+    else
+      @issue_comment = @issue.comments.build(issue_comment_params)
+      @issue_comment.commenter_user_id = @user.id
+      if params[:reassign]
+        reassign_issue
+        @issue_comment.reassign = true
+      end
+      @issue_comment.save!
+      @issue.updated_by = @user.id
+      @issue.save!
+      notice = t('issues.comment.comment_created')
+    end
+    redirect_to @issue, notice: notice
   end
 
   # Status Transistions
@@ -219,7 +226,7 @@ class IssuesController < ApplicationController
     end
 
     def check_permission
-      unless @user.administrator?
+      unless @user.administrator? or @user.moderator?
         flash[:error] = t('application.require_admin.not_an_admin')
         redirect_to root_path
       end