From 9b941fe374225f9f09a582a3b9b15bb2f2dc4233 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Fri, 16 Jun 2017 17:12:04 +0200
Subject: [PATCH] fix flash when deleting samples of other users

---
 app/assets/javascripts/repositories/repository_datatable.js | 2 +-
 app/controllers/repository_rows_controller.rb               | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index a1e486a6a..243e1f75c 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -486,7 +486,7 @@ function onClickDeleteRecord() {
     dataType: 'json',
     data: {selected_rows: rowsSelected},
     success: function(data) {
-      HelperModule.flashAlertMsg(data.flash, 'success');
+      HelperModule.flashAlertMsg(data.flash, data.color);
       rowsSelected = [];
       onClickCancel();
     },
diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb
index 973373022..5a12b07d8 100644
--- a/app/controllers/repository_rows_controller.rb
+++ b/app/controllers/repository_rows_controller.rb
@@ -178,7 +178,8 @@ class RepositoryRowsController < ApplicationController
         end
       end
       if deleted_count.zero?
-        flash = t('repositories.destroy.no_deleted_records_flash')
+        flash = t('repositories.destroy.no_deleted_records_flash',
+                  other_records_number: params[:selected_rows].count)
       elsif deleted_count != params[:selected_rows].count
         not_deleted_count = params[:selected_rows].count - deleted_count
         flash = t('repositories.destroy.contains_other_records_flash',
@@ -189,7 +190,8 @@ class RepositoryRowsController < ApplicationController
                   records_number: deleted_count)
       end
       respond_to do |format|
-        format.json { render json: { flash: flash }, status: :ok }
+        color = deleted_count.zero? ? 'info' : 'success'
+        format.json { render json: { flash: flash, color: color }, status: :ok }
       end
     else
       respond_to do |format|