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

Merge pull request #394 from okriuchykhin/ok_SCI_853

Browse source 
Fix non removable error messages in samples [SCI-853]
This commit is contained in:
okriuchykhin 2017-01-10 11:00:01 +01:00 • committed by GitHub
commit f8237e025a
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/application.js.erb
View file

@ -212,7 +212,9 @@ var HelperModule = (function(){
window.setTimeout(function () { window.setTimeout(function () {
flash.fadeTo(500, 0).slideUp(500, function () { flash.fadeTo(500, 0).slideUp(500, function () {
$(this).remove(); $(this).remove();
if($('.alert').length <= 0) {
$('#content-wrapper').removeClass('alert-shown'); $('#content-wrapper').removeClass('alert-shown');
}
}); });
}, 5000); }, 5000);
} }

2
app/assets/javascripts/samples/sample_datatable.js.erb
View file

@ -506,13 +506,11 @@ function onClickSave() {
data: data, data: data,
success: function (data) { success: function (data) {
sampleAlertMsg(data.flash, "success"); sampleAlertMsg(data.flash, "success");
HelperModule.hideFlashMsg();
onClickCancel(); onClickCancel();
}, },
error: function (e, eData, status, xhr) { error: function (e, eData, status, xhr) {
var data = e.responseJSON; var data = e.responseJSON;
clearAllErrors(); clearAllErrors();
sampleAlertMsgHide();
if (e.status == 404) { if (e.status == 404) {
sampleAlertMsg(I18n.t("samples.js.not_found_error"), "danger"); sampleAlertMsg(I18n.t("samples.js.not_found_error"), "danger");

21
app/assets/javascripts/samples/samples.js
View file

@ -56,28 +56,29 @@ function updateSamplesTypesandGroups() {
} }
function sampleAlertMsg(message, type) { function sampleAlertMsg(message, type) {
var alertType, glyphSign; var alertType;
if (type == 'success') { var glyphSign;
$('#notifications').html('');
if (type === 'success') {
alertType = ' alert-success '; alertType = ' alert-success ';
glyphSign = ' glyphicon-ok-sign '; glyphSign = ' glyphicon-ok-sign ';
} else if (type == 'danger') { } else if (type === 'danger') {
alertType = ' alert-danger '; alertType = ' alert-danger ';
glyphSign = ' glyphicon-exclamation-sign '; glyphSign = ' glyphicon-exclamation-sign ';
} }
var htmlSnippet = '<div class="alert' + alertType + 'alert-dismissable alert-floating">' + var htmlSnippet = '<div class="alert alert' + alertType +
'alert-dismissable alert-floating">' +
'<div class="container">' + '<div class="container">' +
'<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>' + '<button type="button" class="close" ' +
'data-dismiss="alert" aria-label="Close">' +
'<span aria-hidden="true">×</span></button>' +
'<span class="glyphicon' + glyphSign + '"></span>' + '<span class="glyphicon' + glyphSign + '"></span>' +
'<span>' + message + '</span>' + '<span>' + message + '</span>' +
'</div>' + '</div>' +
'</div>'; '</div>';
$('#notifications').html(htmlSnippet); $('#notifications').html(htmlSnippet);
$('#content-wrapper').addClass('alert-shown'); $('#content-wrapper').addClass('alert-shown');
} HelperModule.hideFlashMsg();
function sampleAlertMsgHide() {
$('#notifications').html('<div></div>');
$('#content-wrapper').removeClass('alert-shown');
} }
/** /**