diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2012-06-05 14:28:44 +0200 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2012-06-22 10:45:06 +0200 |
commit | 6f4121ccbb83493463a1f05d8a24f46042e8bf1d (patch) | |
tree | 169b52812f29b56cb9d30a65ac2ec5fd0df4da23 | |
parent | 0948a9f91b3e423df4d06fd13d23b3ec7ccaa921 (diff) | |
download | freeipa.git-6f4121ccbb83493463a1f05d8a24f46042e8bf1d.tar.gz freeipa.git-6f4121ccbb83493463a1f05d8a24f46042e8bf1d.tar.xz freeipa.git-6f4121ccbb83493463a1f05d8a24f46042e8bf1d.zip |
Custom Web UI error message for IPA error 911
Error message for IPA error 911 is not very clear for end users.
This patch changes the message and adds an advice how to get rid of the error.
https://fedorahosted.org/freeipa/ticket/2778
-rw-r--r-- | install/ui/ipa.js | 10 | ||||
-rwxr-xr-x | install/ui/jquery.ordered-map.js | 17 |
2 files changed, 26 insertions, 1 deletions
diff --git a/install/ui/ipa.js b/install/ui/ipa.js index 6e862098..7667c766 100644 --- a/install/ui/ipa.js +++ b/install/ui/ipa.js @@ -491,6 +491,9 @@ IPA.command = function(spec) { that.retry = typeof spec.retry == 'undefined' ? true : spec.retry; that.error_message = spec.error_message || IPA.get_message('dialogs.batch_error_message', 'Some operations failed.'); + that.error_messages = $.ordered_map({ + 911: 'Missing HTTP referer. <br/> You have to configure your browser to send HTTP referer header.' + }); that.get_command = function() { return (that.entity ? that.entity+'_' : '') + that.method; @@ -620,6 +623,13 @@ IPA.command = function(spec) { }; } + // custom messages for set of codes + var error_msg = that.error_messages.get(error_thrown.code); + if (error_msg) { + error_msg = error_msg.replace('${message}', error_thrown.message); + error_thrown.message = error_msg; + } + if (that.retry) { dialog_open.call(this, xhr, text_status, error_thrown); diff --git a/install/ui/jquery.ordered-map.js b/install/ui/jquery.ordered-map.js index 7c0f3fad..64cad6e0 100755 --- a/install/ui/jquery.ordered-map.js +++ b/install/ui/jquery.ordered-map.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -jQuery.ordered_map = jQuery.fn.ordered_map = function() { +jQuery.ordered_map = jQuery.fn.ordered_map = function(map) { var that = {}; @@ -49,6 +49,18 @@ jQuery.ordered_map = jQuery.fn.ordered_map = function() { that.map[key] = value; }; + that.put_map = function(map) { + + if (typeof map !== 'object') return; + + for (name in map) { + + if (map.hasOwnProperty(name)) { + that.put(name, map[name]); + } + } + }; + that.remove = function(key) { var i = that.get_key_index(key); @@ -105,5 +117,8 @@ jQuery.ordered_map = jQuery.fn.ordered_map = function() { return new_map; }; + that.put_map(map); + + return that; }; |