From ed7536837b096e89ca521f0ef5b81a4d9a97eb3e Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Mon, 18 Jul 2016 15:48:53 -0400 Subject: [PATCH] fixed display errors for error dialog --- .../src/main/webapp/resources/js/admin.js | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js index f19e3003d..f00341b13 100644 --- a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js +++ b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js @@ -385,6 +385,10 @@ var ErrorHandlerView = Backbone.View.extend({ }, handleError:function(message) { + + if (!message) { + message = {}; + } if (message.log) { console.log(message.log); @@ -394,21 +398,20 @@ var ErrorHandlerView = Backbone.View.extend({ return function(model, response, options) { - $('#modalAlert').i18n(); - $('#modalAlert div.modal-header').html(_self.headerTemplate({message: message, model: model, response: response, options: options})); - $('#modalAlert .modal-body').html(_self.template({message: message, model: model, response: response, options: options})); + _self.showErrorMessage( + _self.headerTemplate({message: message, model: model, response: response, options: options}), + _self.template({message: message, model: model, response: response, options: options}) + ); $('#modalAlert .modal-body .page-reload').on('click', _self.reloadPage); - - $('#modalAlert').modal({ - 'backdrop': 'static', - 'keyboard': true, - 'show': true - }); + } }, showErrorMessage:function(header, message) { + // hide the sheet if it's visible + $('#loadingbox').sheet('hide'); + $('#modalAlert').i18n(); $('#modalAlert div.modal-header').html(header); $('#modalAlert .modal-body').html(message);