scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-08 12:56:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #694 from mlorb/ml_sci_1347

Browse source 
Fix flash when deleting samples of other users [SCI-1347]
This commit is contained in:
mlorb 2017-06-19 14:19:57 +02:00 • committed by GitHub
commit 7cbc8a2f95
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/repositories/repository_datatable.js
View file

@ -486,7 +486,7 @@ function onClickDeleteRecord() {
dataType: 'json', dataType: 'json',
data: {selected_rows: rowsSelected}, data: {selected_rows: rowsSelected},
success: function(data) { success: function(data) {
HelperModule.flashAlertMsg(data.flash, 'success'); HelperModule.flashAlertMsg(data.flash, data.color);
rowsSelected = []; rowsSelected = [];
onClickCancel(); onClickCancel();
}, },

6
app/controllers/repository_rows_controller.rb
View file

@ -178,7 +178,8 @@ class RepositoryRowsController < ApplicationController
end end
end end
if deleted_count.zero? 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 elsif deleted_count != params[:selected_rows].count
not_deleted_count = params[:selected_rows].count - deleted_count not_deleted_count = params[:selected_rows].count - deleted_count
flash = t('repositories.destroy.contains_other_records_flash', flash = t('repositories.destroy.contains_other_records_flash',
@ -189,7 +190,8 @@ class RepositoryRowsController < ApplicationController
records_number: deleted_count) records_number: deleted_count)
end end
respond_to do |format| 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 end
else else
respond_to do |format| respond_to do |format|