diff --git a/app/assets/javascripts/samples/samples.js b/app/assets/javascripts/samples/samples.js index 0b547bf9c..c5a4dd3d0 100644 --- a/app/assets/javascripts/samples/samples.js +++ b/app/assets/javascripts/samples/samples.js @@ -45,6 +45,7 @@ $("#modal-create-sample-type").on("shown.bs.modal", function(event) { $("form#new_sample_type").on("ajax:success", function(ev, data, status) { $("#modal-create-sample-type").modal("hide"); updateSamplesTypesandGroups(); + sampleAlertMsg(data.flash); }); $("form#new_sample_type").on("ajax:error", function(e, data, status, xhr) { @@ -73,6 +74,7 @@ $("#modal-create-sample-group").on("shown.bs.modal", function(event) { $("form#new_sample_group").on("ajax:success", function(ev, data, status) { $("#modal-create-sample-group").modal("hide"); updateSamplesTypesandGroups(); + sampleAlertMsg(data.flash); }); $("form#new_sample_group").on("ajax:error", function(e, data, status, xhr) { @@ -141,6 +143,17 @@ function updateSamplesTypesandGroups() { }); } +function sampleAlertMsg(message) { + var html_snippet = '
' + + '
' + + '' + + '' + + ''+ message +'' + + '
' + + '
'; + $('#notifications').html(html_snippet); +} + function initTutorial() { var currentStep = parseInt(Cookies.get('current_tutorial_step'), 10); if (currentStep == 8) diff --git a/app/assets/stylesheets/samples.scss b/app/assets/stylesheets/samples.scss index 8d13e9743..98014cc35 100644 --- a/app/assets/stylesheets/samples.scss +++ b/app/assets/stylesheets/samples.scss @@ -16,4 +16,10 @@ .alert { position: inherit !important; } +} + +.samples-flash-alert { + position: relative; + top: 50px; + z-index: 1000; } \ No newline at end of file diff --git a/app/controllers/sample_groups_controller.rb b/app/controllers/sample_groups_controller.rb index d3a5632d8..104d793f9 100644 --- a/app/controllers/sample_groups_controller.rb +++ b/app/controllers/sample_groups_controller.rb @@ -19,7 +19,12 @@ class SampleGroupsController < ApplicationController if @sample_group.save format.json { render json: { - id: @sample_group.id + id: @sample_group.id, + flash: t( + "sample_groups.create.success_flash", + sample_group: @sample_group.name, + organization: @organization.name + ) }, status: :ok } diff --git a/app/controllers/sample_types_controller.rb b/app/controllers/sample_types_controller.rb index 6c6e7d6c8..d4ee5a7e5 100644 --- a/app/controllers/sample_types_controller.rb +++ b/app/controllers/sample_types_controller.rb @@ -17,14 +17,19 @@ class SampleTypesController < ApplicationController respond_to do |format| if @sample_type.save - flash[:success] = t( - "sample_types.create.success_flash", - sample_type: @sample_type.name, - organization: @organization.name - ) + # flash[:success] = t( + # "sample_types.create.success_flash", + # sample_type: @sample_type.name, + # organization: @organization.name + # ) format.json { render json: { - id: @sample_type.id + id: @sample_type.id, + flash: t( + "sample_types.create.success_flash", + sample_type: @sample_type.name, + organization: @organization.name + ) }, status: :ok }