From 773b00933a80fd392fbadbb4c21040732ddf77f5 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Mon, 9 Jan 2017 13:55:50 +0100
Subject: [PATCH] Improve multiple messages handling in samples [SCI-853]

---
 app/assets/javascripts/application.js.erb | 4 +++-
 app/assets/javascripts/samples/samples.js | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index 0f20ba9c6..c0e7a86f1 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -212,7 +212,9 @@ var HelperModule = (function(){
       window.setTimeout(function () {
         flash.fadeTo(500, 0).slideUp(500, function () {
           $(this).remove();
-          $('#content-wrapper').removeClass('alert-shown');
+          if($('.alert').length <= 0) {
+            $('#content-wrapper').removeClass('alert-shown');
+          }
         });
       }, 5000);
     }
diff --git a/app/assets/javascripts/samples/samples.js b/app/assets/javascripts/samples/samples.js
index 2f194282c..21576f317 100644
--- a/app/assets/javascripts/samples/samples.js
+++ b/app/assets/javascripts/samples/samples.js
@@ -58,6 +58,7 @@ function updateSamplesTypesandGroups() {
 function sampleAlertMsg(message, type) {
   var alertType;
   var glyphSign;
+  $('#notifications').html('');
   if (type === 'success') {
     alertType = ' alert-success ';
     glyphSign = ' glyphicon-ok-sign ';