BURs: allow only pending BURs to be rejected.
Fix it being possible to reject approved BURs, or to re-reject already rejected BURs. Rejecting an approved BUR wouldn't revert the aliases/implications, but it would change the BUR's status to rejected.
This commit is contained in:
@@ -16,6 +16,7 @@ class BulkUpdateRequestsController < ApplicationController
|
|||||||
|
|
||||||
def show
|
def show
|
||||||
@bulk_update_request = BulkUpdateRequest.find(params[:id])
|
@bulk_update_request = BulkUpdateRequest.find(params[:id])
|
||||||
|
respond_with(@bulk_update_request)
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
@@ -37,7 +38,7 @@ class BulkUpdateRequestsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
if @bulk_update_request.editable?(CurrentUser.user)
|
if @bulk_update_request.rejectable?(CurrentUser.user)
|
||||||
@bulk_update_request.reject!(CurrentUser.user)
|
@bulk_update_request.reject!(CurrentUser.user)
|
||||||
flash[:notice] = "Bulk update request rejected"
|
flash[:notice] = "Bulk update request rejected"
|
||||||
respond_with(@bulk_update_request, :location => bulk_update_requests_path)
|
respond_with(@bulk_update_request, :location => bulk_update_requests_path)
|
||||||
|
|||||||
@@ -181,6 +181,14 @@ class BulkUpdateRequest < ApplicationRecord
|
|||||||
user_id == user.id || user.is_builder?
|
user_id == user.id || user.is_builder?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def approvable?(user)
|
||||||
|
!is_approved? && user.is_admin?
|
||||||
|
end
|
||||||
|
|
||||||
|
def rejectable?(user)
|
||||||
|
is_pending? && editable?(user)
|
||||||
|
end
|
||||||
|
|
||||||
def reason_with_link
|
def reason_with_link
|
||||||
"[bur:#{id}]\n\nReason: #{reason}"
|
"[bur:#{id}]\n\nReason: #{reason}"
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user