Send notifications and leave system comments when bulk updating issues.

3 files changed, 22 insertions, 28 deletions

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 6a2af08a199..1f1a9b4d43a 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -93,7 +93,7 @@ class Projects::IssuesController < Projects::ApplicationController
   end
 
   def bulk_update
-    result = Issues::BulkUpdateService.new(project, current_user, params).execute
+    result = Issues::BulkUpdateService.new(project, current_user, bulk_update_params).execute
     redirect_to :back, notice: "#{result[:count]} issues updated"
   end
 
@@ -141,4 +141,13 @@ class Projects::IssuesController < Projects::ApplicationController
       :milestone_id, :state_event, :task_num, label_ids: []
     )
   end
+
+  def bulk_update_params
+    params.require(:update).permit(
+      :issues_ids,
+      :assignee_id,
+      :milestone_id,
+      :state_event
+    )
+  end
 end
diff --git a/app/services/issues/bulk_update_service.rb b/app/services/issues/bulk_update_service.rb
index f72a346af6f..c7cd20b6b60 100644
--- a/app/services/issues/bulk_update_service.rb
+++ b/app/services/issues/bulk_update_service.rb
@@ -1,38 +1,23 @@
 module Issues
   class BulkUpdateService < BaseService
     def execute
-      update_data = params[:update]
+      issues_ids   = params.delete(:issues_ids).split(",")
+      issue_params = params
 
-      issues_ids   = update_data[:issues_ids].split(",")
-      milestone_id = update_data[:milestone_id]
-      assignee_id  = update_data[:assignee_id]
-      status       = update_data[:status]
-
-      new_state = nil
-
-      if status.present?
-        if status == 'closed'
-          new_state = :close
-        else
-          new_state = :reopen
-        end
-      end
-
-      opts = {}
-      opts[:milestone_id] = milestone_id if milestone_id.present?
-      opts[:assignee_id] = assignee_id if assignee_id.present?
+      issue_params.delete(:state_event) unless issue_params[:state_event].present?
+      issue_params.delete(:milestone_id) unless issue_params[:milestone_id].present?
+      issue_params.delete(:assignee_id) unless issue_params[:assignee_id].present?
 
       issues = Issue.where(id: issues_ids)
-      issues = issues.select { |issue| can?(current_user, :modify_issue, issue) }
-
       issues.each do |issue|
-        issue.update_attributes(opts)
-        issue.send new_state if new_state
+        next unless can?(current_user, :modify_issue, issue)
+
+        Issues::UpdateService.new(issue.project, current_user, issue_params).execute(issue)
       end
 
       {
-        count: issues.count,
-        success: !issues.count.zero?
+        count:    issues.count,
+        success:  !issues.count.zero?
       }
     end
   end
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 7defc8787a9..cbbcb1d06c0 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -25,11 +25,11 @@
   .clearfix
     .issues_bulk_update.hide
       = form_tag bulk_update_namespace_project_issues_path(@project.namespace, @project), method: :post  do
-        = select_tag('update[status]', options_for_select([['Open', 'open'], ['Closed', 'closed']]), prompt: "Status")
+        = select_tag('update[state_event]', options_for_select([['Open', 'reopen'], ['Closed', 'close']]), prompt: "Status")
         = project_users_select_tag('update[assignee_id]', placeholder: 'Assignee')
         = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
         = hidden_field_tag 'update[issues_ids]', []
-        = hidden_field_tag :status, params[:status]
+        = hidden_field_tag :state_event, params[:state_event]
         = button_tag "Update issues", class: "btn update_selected_issues btn-save"
 
 .issues-holder