scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #529 from ZmagoD/zd_SCI_1135

Browse source 
fixes alert messages in samples [fixes SCI-1135]
This commit is contained in:
Zmago Devetak 2017-03-29 14:57:11 +02:00 committed by GitHub
parent 0019fd19ea 9ce95470b3
commit 2b35b34eb8
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -234,6 +234,9 @@ var HelperModule = (function(){
} else if (type === 'danger') {
alertType = ' alert-danger ';
glyphSign = ' glyphicon-exclamation-sign ';
} else if (type === 'info') {
alertType = ' alert-info ';
glyphSign = ' glyphicon-exclamation-sign ';
}
var htmlSnippet = '<div class="alert alert' + alertType +
'alert-dismissable alert-floating">' +

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

@ -504,7 +504,7 @@ function onClickEdit() {
error: function (e, data, status, xhr) {
if (e.status == 403) {
HelperModule.flashAlertMsg(
I18n.t('samples.js.permission_error'), 'danger'
I18n.t('samples.js.permission_error'), e.responseJSON.style
);
changeToViewMode();
updateButtons();
@ -1245,7 +1245,7 @@ function changeToEditMode() {
renderFormError(undefined,
$(li).find('.text-edit'),
Object.keys(msg)[0] + ' ' + msg.name.toString());
msg.name.toString());
var verticalHeight = $(li).offset().top;
dropdownList.scrollTo(verticalHeight,0);
setTimeout(function() {
@ -1332,7 +1332,7 @@ function changeToEditMode() {
renderFormError(undefined,
$(li).find('.text-edit'),
Object.keys(msg)[0] + ' ' + msg.name.toString());
msg.name.toString());
var verticalHeight = $(li).offset().top;
dropdownList.scrollTo(verticalHeight,0);
setTimeout(function() {

14
app/controllers/application_controller.rb
View file

@ -44,16 +44,16 @@ class ApplicationController < ActionController::Base
end
end
def render_403
def render_403(style = 'danger')
respond_to do |format|
format.html {
format.html do
render file: 'public/403.html', status: :forbidden, layout: false
}
format.json {
render json: {}, status: :forbidden
}
end
format.json do
render json: { style: style }, status: :forbidden
end
end
return true
true
end
def render_404