From b17f9a61576d9bd1fce0848e7983b495919828fb Mon Sep 17 00:00:00 2001 From: Shrey Date: Sat, 20 Jun 2015 17:36:56 +0530 Subject: [PATCH] Fixed an error + Added email notifications for moderators --- app/controllers/issues_controller.rb | 10 ++++++---- app/views/user/view.html.erb | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 6ef7b0423..49984b804 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -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 diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 04329feb7..41d7b0064 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -82,7 +82,7 @@ <% end %>
  • - <%= link_to t('user.view.report'), new_issue_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name) %> + <%= link_to t('user.view.report'), new_issue_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name, reported_user_id: @this_user.id) %>
  • <% if @this_user.blocks.exists? %>
  • -- 2.43.2