diff --git a/app/assets/javascripts/samples/sample_datatable.js b/app/assets/javascripts/samples/sample_datatable.js index dc5c18d96..547469f68 100644 --- a/app/assets/javascripts/samples/sample_datatable.js +++ b/app/assets/javascripts/samples/sample_datatable.js @@ -398,6 +398,7 @@ function onClickSave() { dataType: "json", data: data, success: function (data) { + sampleAlertMsg(data.flash); onClickCancel(); }, error: function (e, eData, status, xhr) { diff --git a/app/controllers/samples_controller.rb b/app/controllers/samples_controller.rb index e20b081b8..21e8cae0f 100644 --- a/app/controllers/samples_controller.rb +++ b/app/controllers/samples_controller.rb @@ -80,7 +80,17 @@ class SamplesController < ApplicationController errors.delete_if { |k, v| v.blank? } if errors.empty? - format.json { render json: {}, status: :ok } + format.json { + render json: { + id: sample.id, + flash: t( + 'samples.create.success_flash', + sample: sample.name, + organization: @organization.name + ) + }, + status: :ok + } else format.json { render json: errors, status: :bad_request } end @@ -227,7 +237,17 @@ class SamplesController < ApplicationController # Now we can destroy empty scfs scf_to_delete.map(&:destroy) - format.json { render json: {}, status: :ok } + format.json { + render json: { + id: sample.id, + flash: t( + 'samples.update.success_flash', + sample: sample.name, + organization: @organization.name + ) + }, + status: :ok + } else format.json { render json: errors, status: :bad_request } end diff --git a/config/locales/en.yml b/config/locales/en.yml index 7353228bb..0f1ba935a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -909,7 +909,7 @@ en: create: "Edit sample" scf_does_not_exist: "This field does not exists." create: - success_flash: "Successfully added sample to team %{organization}" + success_flash: "Successfully added sample %{sample} to team %{organization}" update: success_flash: "Successfully updated sample %{sample} to team %{organization}" destroy: