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

Fix error handling for protocols [SCI-8341] (#5316)

Browse source
This commit is contained in:
ajugo 2023-04-18 11:22:17 +02:00 committed by GitHub
parent c763882fe6
commit 0868f60242
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/access_permissions/projects_controller.rb
View file

@ -100,7 +100,7 @@ module AccessPermissions
end
rescue ActiveRecord::RecordInvalid => e
Rails.logger.error e.message
errors = @project.errors ? @project.errors&.map(&:message)&.join(',') : e.message
errors = @project.errors.present? ? @project.errors&.map(&:message)&.join(',') : e.message
render json: { flash: errors }, status: :unprocessable_entity
raise ActiveRecord::Rollback
end

2
app/controllers/access_permissions/protocols_controller.rb
View file

@ -96,7 +96,7 @@ module AccessPermissions
rescue ActiveRecord::RecordInvalid => e
Rails.logger.error e.message
errors = @protocol.errors ? @protocol.errors&.map(&:message)&.join(',') : e.message
errors = @protocol.errors.present? ? @protocol.errors&.map(&:message)&.join(',') : e.message
render json: { flash: errors }, status: :unprocessable_entity
raise ActiveRecord::Rollback
end

4
app/controllers/steps_controller.rb
View file

@ -85,7 +85,7 @@ class StepsController < ApplicationController
)
@step = @protocol.insert_step(@step, params[:position])
if @protocol.in_repository? && @protocol.errors
if @protocol.in_repository? && @protocol.errors.present?
return render json: { error: @protocol.errors }, status: :unprocessable_entity
end
@ -129,7 +129,7 @@ class StepsController < ApplicationController
end
render json: @step, serializer: StepSerializer, user: current_user
else
render json: @protocol.errors ? { errors: @protocol.errors } : {}, status: :unprocessable_entity
render json: @protocol.errors.present? ? { errors: @protocol.errors } : {}, status: :unprocessable_entity
end
end