diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js index a1c11a2a9..085b4c6b8 100644 --- a/modoboa/static/js/global.js +++ b/modoboa/static/js/global.js @@ -136,6 +136,7 @@ function display_form_errors(formid, data) { var $widget = $("#" + formid + " #" + fullid); var spanid = fullid + "-error"; var $span = $("#" + spanid); + var error = value.join(' '); if (!$widget.parents(".form-group").hasClass("has-error")) { $widget.parents(".form-group").addClass("has-error"); @@ -143,12 +144,12 @@ function display_form_errors(formid, data) { if (!$span.length) { $span = $("", { "class": "help-block", - "html": value[0], + "html": error, "id": spanid }); $widget.parents(".form-group").append($span); } else { - $span.html(value[0]); + $span.html(error); } }); } diff --git a/modoboa/static/js/twocols_nav.js b/modoboa/static/js/twocols_nav.js index 3401e0933..0903276b0 100644 --- a/modoboa/static/js/twocols_nav.js +++ b/modoboa/static/js/twocols_nav.js @@ -36,13 +36,15 @@ TwocolsNav.prototype = { success_cb: $.proxy(this.save_cb, this) }); }, this)); - $(document).on('submit', '#parameters_form', $.proxy(function(evt) { + var formId = 'parameters_form'; + $(document).on('submit', '#' + formId, $.proxy(function(evt) { simple_ajax_form_post(evt, { - formid: $(this).attr('id'), + formid: formId, modal: false, reload_on_success: false, success_cb: $.proxy(this.save_cb, this), error_cb: function(data) { + window.scrollTo(0, 0); $('a[data-app="' + data.prefix + '"]').tab('show'); } });