diff options
Diffstat (limited to 'app/controllers/issues_controller.rb')
| -rw-r--r-- | app/controllers/issues_controller.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 929b928ac..a41dc5040 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -146,7 +146,6 @@ class IssuesController < ApplicationController if @issue.save attach_files(@issue, params[:attachments]) flash[:notice] = l(:notice_successful_create) - Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added') call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue}) redirect_to(params[:continue] ? { :action => 'new', :tracker_id => @issue.tracker } : { :action => 'show', :id => @issue }) @@ -193,7 +192,6 @@ class IssuesController < ApplicationController if !journal.new_record? # Only send notification if something was actually changed flash[:notice] = l(:notice_successful_update) - Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated') end call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal}) redirect_to(params[:back_to] || {:action => 'show', :id => @issue}) @@ -247,10 +245,7 @@ class IssuesController < ApplicationController issue.custom_field_values = custom_field_values if custom_field_values && !custom_field_values.empty? call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue }) # Don't save any change to the issue if the user is not authorized to apply the requested status - if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save - # Send notification for each issue (if changed) - Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated') - else + unless (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save # Keep unsaved issue ids to display them in flash error unsaved_issue_ids << issue.id end |