IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Report phase errors

Browse Source 
https://fedorahosted.org/freeipa/ticket/3235
This commit is contained in:
Petr Vobornik
2013-04-12 17:21:24 +02:00
parent 9f0188684f
commit 952234ef79
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
install/ui/src/freeipa/Application_controller.js
View File

@@ -24,7 +24,8 @@
* Controls interaction between navigation, menu and facets.
*/
define(['dojo/_base/declare',
define([
'dojo/_base/declare',
'dojo/_base/lang',
'dojo/_base/array',
'dojo/Deferred',
@@ -32,6 +33,7 @@ define(['dojo/_base/declare',
'dojo/topic',
'dojo/query',
'dojo/dom-class',
'./json2',
'./widgets/App',
'./ipa',
'./navigation/Menu',
@@ -39,7 +41,7 @@ define(['dojo/_base/declare',
'./navigation/menu_spec'
],
function(declare, lang, array, Deferred, on, topic, query, dom_class,
App_widget, IPA, Menu, Router, menu_spec) {
JSON, App_widget, IPA, Menu, Router, menu_spec) {
/**
* Main application
@@ -176,11 +178,24 @@ define(['dojo/_base/declare',
},
on_phase_error: function(error) {
// FIXME: CHANGE!!!
window.alert('Initialization error, have a coffee and relax.');
// var container = $('#content').empty();
// container.append('<p>Error: '+error_thrown.name+'</p>');
// container.append('<p>'+error_thrown.message+'</p>');
window.console.error(error);
error = error || {};
var name = error.name || 'Runtime error';
var error_container = $('<div/>', {
'class': 'facet-content facet-error'
}).appendTo($('.content').empty());
error_container.append('<h1>'+name+'</h1>');
var details = $('<div/>', {
'class': 'error-details'
}).appendTo(error_container);
details.append('<p> Web UI got in unrecoverable state during "'+error.phase+'" phase.</p>');
if (error.results) {
details.append('<strong>Technical details:</strong>');
details.append('<p>'+JSON.stringify(error.results)+'</p>');
}
},
on_facet_change: function(event) {

12
install/ui/src/freeipa/_base/Phase_controller.js
View File

@@ -22,10 +22,11 @@ define([
'dojo/_base/lang',
'dojo/_base/array',
'dojo/_base/declare',
'dojo/Deferred',
'dojo/promise/all',
'dojo/topic',
'../ordered-map'
], function(lang, array, declare, all, topic, ordered_map) {
], function(lang, array, declare, Deferred, all, topic, ordered_map) {
var Phase_controller = declare(null, {
@@ -76,7 +77,14 @@ define([
});
array.forEach(tasks, function(task) {
var promise = task.handler();
var promise;
try {
promise = task.handler();
} catch (e) {
var fail = new Deferred();
fail.reject(e, true);
promise = fail.promise;
}
promises.push(promise);
});