scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4457 from okriuchykhin/ok_SCI_7241

Browse source 
Improve error handling in label template preview generation [SCI-7241]
This commit is contained in:
Alex Kriuchykhin 2022-09-26 10:33:30 +02:00 committed by GitHub
parent e96b15b241 1d7bca0664
commit fcd235b654
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/label_templates_controller.rb
View file

@ -136,7 +136,7 @@ class LabelTemplatesController < ApplicationController
if service.error.blank?
render json: { base64_preview: payload }
else
render json: { error: I18n.t('errors.general') }, status: :unprocessable_entity
render json: { error: service.error }, status: :unprocessable_entity
end
end

7
app/services/label_templates_preview_service.rb
View file

@ -27,7 +27,12 @@ class LabelTemplatesPreviewService
if resp.function_error.nil?
@preview = resp.payload.string.delete('"')
else
@error = resp.function_error.string
begin
error_response = JSON.parse(resp.payload.string)
@error = error_response['errorMessage']
rescue JSON::ParserError
@error = resp.function_error
end
end
end