Merge pull request #3375 from evazion/feat-3372

Fix #3374: List approver in BUR approval messages
2017-11-16 11:02:18 -08:00
parent 5f004b6138 3cf753c540
commit 7d8df00195
13 changed files with 78 additions and 45 deletions
--- a/app/controllers/bulk_update_requests_controller.rb
+++ b/app/controllers/bulk_update_requests_controller.rb
@@ -38,7 +38,7 @@ class BulkUpdateRequestsController < ApplicationController

  def destroy
    if @bulk_update_request.editable?(CurrentUser.user)
-      @bulk_update_request.reject!
+      @bulk_update_request.reject!(CurrentUser.user)
      flash[:notice] = "Bulk update request rejected"
      respond_with(@bulk_update_request, :location => bulk_update_requests_path)
    else