diff --git a/app/controllers/bulk_update_requests_controller.rb b/app/controllers/bulk_update_requests_controller.rb index a89cc4113..b0d6894e9 100644 --- a/app/controllers/bulk_update_requests_controller.rb +++ b/app/controllers/bulk_update_requests_controller.rb @@ -16,6 +16,7 @@ class BulkUpdateRequestsController < ApplicationController def show @bulk_update_request = BulkUpdateRequest.find(params[:id]) + respond_with(@bulk_update_request) end def edit @@ -37,7 +38,7 @@ class BulkUpdateRequestsController < ApplicationController end def destroy - if @bulk_update_request.editable?(CurrentUser.user) + if @bulk_update_request.rejectable?(CurrentUser.user) @bulk_update_request.reject!(CurrentUser.user) flash[:notice] = "Bulk update request rejected" respond_with(@bulk_update_request, :location => bulk_update_requests_path) diff --git a/app/models/bulk_update_request.rb b/app/models/bulk_update_request.rb index 0d72130e5..e0c73dc17 100644 --- a/app/models/bulk_update_request.rb +++ b/app/models/bulk_update_request.rb @@ -181,6 +181,14 @@ class BulkUpdateRequest < ApplicationRecord user_id == user.id || user.is_builder? end + def approvable?(user) + !is_approved? && user.is_admin? + end + + def rejectable?(user) + is_pending? && editable?(user) + end + def reason_with_link "[bur:#{id}]\n\nReason: #{reason}" end