scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 21:21:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix step deletion for API [SCI-6561] (#3914)

Browse source
This commit is contained in:
Alex Kriuchykhin 2022-03-03 10:00:44 +01:00 committed by GitHub
parent c4d6aad658
commit 32d005f480
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/api/v1/steps_controller.rb
View file

@ -6,10 +6,11 @@ module Api
include Api::V1::ExtraParams include Api::V1::ExtraParams
before_action :load_team, :load_project, :load_experiment, :load_task, :load_protocol before_action :load_team, :load_project, :load_experiment, :load_task, :load_protocol
before_action only: :show do before_action only: %i(show update destroy) do
load_step(:id) load_step(:id)
end end
before_action :load_step_for_managing, only: %i(update destroy) before_action :check_manage_permissions, only: :update
before_action :check_delete_permissions, only: :destroy
def index def index
steps = @protocol.steps.page(params.dig(:page, :number)).per(params.dig(:page, :size)) steps = @protocol.steps.page(params.dig(:page, :number)).per(params.dig(:page, :size))
@ -75,15 +76,18 @@ module Api
%w(tables assets checklists checklists.checklist_items comments user) %w(tables assets checklists checklists.checklist_items comments user)
end end
def load_step_for_managing def check_manage_permissions
@step = @protocol.steps.find(params.require(:id))
if step_params.key?(:completed) && step_params.except(:completed).blank? if step_params.key?(:completed) && step_params.except(:completed).blank?
raise PermissionError.new(Step, :toggle_completion) unless can_complete_or_checkbox_step?(@step.protocol) raise PermissionError.new(Step, :toggle_completion) unless can_complete_or_checkbox_step?(@step.protocol)
else else
raise PermissionError.new(Protocol, :manage) unless can_manage_protocol_in_module?(@step.protocol) raise PermissionError.new(Step, :manage) unless can_manage_step?(@step)
end end
end end
def check_delete_permissions
raise PermissionError.new(Step, :delete) unless can_manage_step?(@step)
end
def log_activity(type_of, message_items = {}) def log_activity(type_of, message_items = {})
default_items = { step: @step.id, step_position: { id: @step.id, value_for: 'position_plus_one' } } default_items = { step: @step.id, step_position: { id: @step.id, value_for: 'position_plus_one' } }
message_items = default_items.merge(message_items) message_items = default_items.merge(message_items)