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

fixes troubles

Browse source
This commit is contained in:
Mojca Lorber 2016-08-30 09:43:39 +02:00
parent b07f1af90f
commit a35bf7182f
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/samples_controller.rb
View file

@ -80,7 +80,7 @@ class SamplesController < ApplicationController
errors.delete_if { |k, v| v.blank? }
if errors.empty?
format.json
format.json do
render json: {
id: sample.id,
flash: t(
@ -90,6 +90,7 @@ class SamplesController < ApplicationController
)
},
status: :ok
end
else
format.json { render json: errors, status: :bad_request }
end
@ -236,7 +237,7 @@ class SamplesController < ApplicationController
# Now we can destroy empty scfs
scf_to_delete.map(&:destroy)
format.json
format.json do
render json: {
id: sample.id,
flash: t(
@ -246,6 +247,7 @@ class SamplesController < ApplicationController
)
},
status: :ok
end
else
format.json { render json: errors, status: :bad_request }
end