summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2017-04-03 09:21:20 +0200
committerAzul <azul@riseup.net>2017-04-03 09:21:20 +0200
commit49618effe081ebf5e72a5945fa1822c471369cf0 (patch)
tree3b6897989567212bd7f4abda2a8586bf8c80f789 /app/assets
parent5a8ad66825e236308195fd3737e98d52a3322d5b (diff)
fix: error message display in production
only use the <pre> tag if the response was a text message i.e. during dev errors. Use the alert-danger class of bootstrap 3 rather than alert-error.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/leap.js2
-rw-r--r--app/assets/javascripts/users.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/leap.js b/app/assets/javascripts/leap.js
index c12a2d6..5084efa 100644
--- a/app/assets/javascripts/leap.js
+++ b/app/assets/javascripts/leap.js
@@ -3,7 +3,7 @@
// add a bootstrap alert to the page via javascript.
//
function alert_message(msg) {
- $('#messages').append('<div class="alert alert-error"><a class="close" data-dismiss="alert">×</a><pre>'+msg+'</pre></div>');
+ $('#messages').append('<div class="alert alert-danger"><a class="close" data-dismiss="alert">×</a>'+msg+'</div>');
}
ClientSideValidations.formBuilders['SimpleForm::FormBuilder'].wrappers.bootstrap = ClientSideValidations.formBuilders['SimpleForm::FormBuilder'].wrappers["default"];
diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index 9a10532..d080b49 100644
--- a/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
@@ -139,7 +139,7 @@
return message.errors || { base: message.error };
} else {
return {
- base: message
+ base: '<pre>' + message + '</pre>'
};
}
}