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

support multi-line error messages in exceptions

Browse Source
This commit is contained in:
Alexander Bokovoy
2012-10-04 15:05:17 +03:00
committed by Martin Kosek
parent 0575e68013
commit 6f45de10d7
3 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install/ui/ipa.css
View File

@@ -1112,6 +1112,13 @@ table.kerberos-key-status {
background-color: #daa520;
}
.error-message-hinted {
color: red;
padding-top: 0.5em;
padding-bottom: 0.5em;
font-family: monospace;
}
/* ---- Table ---- */
table.scrollable thead {
@@ -1784,4 +1791,4 @@ form#login {
.choice-header {
font-weight: bold;
}
}

31
install/ui/ipa.js
View File

@@ -1419,6 +1419,25 @@ IPA.error_dialog = function(spec) {
that.visible_buttons = spec.visible_buttons || ['retry', 'cancel'];
};
that.beautify_message = function(container, message) {
var lines = message.split(/\n/g);
var line_span;
for(var i=0; i<lines.length; i++) {
// multi-lined text may contain TAB character as first char of the line
// to hint at marking the whole line differently
if (lines[i].charAt(0) == '\t') {
line_span = $('<p />', {
'class': 'error-message-hinted',
text: lines[i].substr(1)
}).appendTo(container);
} else {
line_span = $('<p />', {
text: lines[i]
}).appendTo(container);
}
}
};
that.create = function() {
if (that.error_thrown.url) {
$('<p/>', {
@@ -1426,9 +1445,9 @@ IPA.error_dialog = function(spec) {
}).appendTo(that.container);
}
$('<p/>', {
html: that.error_thrown.message
}).appendTo(that.container);
var error_message = $('<div />', {});
that.beautify_message(error_message, that.error_thrown.message);
error_message.appendTo(that.container);
if(that.errors && that.errors.length > 0) {
//render errors
@@ -1457,9 +1476,9 @@ IPA.error_dialog = function(spec) {
for(var i=0; i < that.errors.length; i++) {
var error = that.errors[i];
if(error.message) {
var error_div = $('<li />', {
text: error.message
}).appendTo(errors_container);
var error_div = $('<li />', {});
that.beautify_message(error_div, error.message);
error_div.appendTo(errors_container);
}
}

12
ipalib/errors.py
View File

@@ -265,11 +265,17 @@ class PublicError(StandardError):
)
self.format = format
self.forwarded = False
self.msg = self.format % kw
def convert_keyword(value):
if isinstance(value, list):
result=u'\n'.join(map(lambda line: unicode(line), value))
return result
return value
kwargs = dict(map(lambda (k,v): (k, convert_keyword(v)), kw.items()))
self.msg = self.format % kwargs
if isinstance(self.format, basestring):
self.strerror = ugettext(self.format) % kw
self.strerror = ugettext(self.format) % kwargs
else:
self.strerror = self.format % kw
self.strerror = self.format % kwargs
else:
if isinstance(message, (Gettext, NGettext)):
message = unicode(message)