diff --git a/install/ui/src/freeipa/Application_controller.js b/install/ui/src/freeipa/Application_controller.js index 69b9cd1c3..5c040e4a0 100644 --- a/install/ui/src/freeipa/Application_controller.js +++ b/install/ui/src/freeipa/Application_controller.js @@ -257,15 +257,20 @@ define([ 'class': 'error-details' }).appendTo(error_container); - details.append($('
', { text: 'Web UI got in unrecoverable state during "' + error.phase + '" phase' })); + details.append($('', { text: 'Web UI got in unrecoverable state during "' + error.phase + '" phase.' })); if (error.name) window.console.error(error.name); if (error.results) { - var msg = error.results.message; - var stack = error.results.stack.toString(); - window.console.error(stack); details.append('', { text: stack })));
+ var msg = error.results.message;
+ if (msg) {
+ window.console.error(msg);
+ details.append($('', { text: msg }));
+ }
+ if (error.results.stack) {
+ var stack = error.results.stack.toString();
+ window.console.error(stack);
+ details.append($('').append($('', { text: stack })));
+ }
}
},
diff --git a/install/ui/src/freeipa/app_container.js b/install/ui/src/freeipa/app_container.js
index 0a49307e3..1194fd142 100644
--- a/install/ui/src/freeipa/app_container.js
+++ b/install/ui/src/freeipa/app_container.js
@@ -63,6 +63,14 @@ define([
phases.on('init', lang.hitch(this, function() {
var deferred = new Deferred();
+ if (!window.sessionStorage) {
+ deferred.reject({
+ message: "Web UI requires sessionStorage enabled. " +
+ "This might be caused by too strict browser " +
+ "configuration."
+ });
+ return deferred.promise;
+ }
if (window.sessionStorage.getItem('logout')) {
window.sessionStorage.removeItem('logout');
var login_facet = reg.facet.get('login');