scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 00:11:22 +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

42
app/controllers/samples_controller.rb
View file

@ -80,16 +80,17 @@ class SamplesController < ApplicationController
errors.delete_if { |k, v| v.blank? } errors.delete_if { |k, v| v.blank? }
if errors.empty? if errors.empty?
format.json format.json do
render json: { render json: {
id: sample.id, id: sample.id,
flash: t( flash: t(
'samples.create.success_flash', 'samples.create.success_flash',
sample: sample.name, sample: sample.name,
organization: @organization.name organization: @organization.name
) )
}, },
status: :ok status: :ok
end
else else
format.json { render json: errors, status: :bad_request } format.json { render json: errors, status: :bad_request }
end end
@ -236,16 +237,17 @@ class SamplesController < ApplicationController
# Now we can destroy empty scfs # Now we can destroy empty scfs
scf_to_delete.map(&:destroy) scf_to_delete.map(&:destroy)
format.json format.json do
render json: { render json: {
id: sample.id, id: sample.id,
flash: t( flash: t(
'samples.update.success_flash', 'samples.update.success_flash',
sample: sample.name, sample: sample.name,
organization: @organization.name organization: @organization.name
) )
}, },
status: :ok status: :ok
end
else else
format.json { render json: errors, status: :bad_request } format.json { render json: errors, status: :bad_request }
end end