From a7ab63b84cb07c2a09a271b2bb598fcbf0d144f9 Mon Sep 17 00:00:00 2001 From: Pavel Vomacka Date: Wed, 6 Sep 2017 15:20:07 +0200 Subject: [PATCH] WebUI: Fix calling undefined method during reset passwords When calling reset password the whoami command is not called in batch command, therefore the result is different then in calling during reset password operation. That needs to be handled to properly set entity_show method which needs to be called after to gather data about logged in entity. https://pagure.io/freeipa/issue/7143 Reviewed-By: Alexander Bokovoy --- install/ui/src/freeipa/ipa.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index 3920b8eb0..138ca031b 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -264,18 +264,19 @@ var IPA = function () { return rpc.command({ method: 'whoami', on_success: function(data, text_status, xhr) { - that.whoami.metadata = data; + that.whoami.metadata = data.result || data; + var wa_data = that.whoami.metadata; rpc.command({ - method: data.details || data.command, - args: data.arguments, + method: wa_data.details || wa_data.command, + args: wa_data.arguments, options: function() { - var options = data.options || []; + var options = wa_data.options || []; $.extend(options, {all: true}); return options; }(), on_success: function(data, text_status, xhr) { - that.whoami.data = false ? data.result[0] : data.result.result; + that.whoami.data = data.result.result; var entity = that.whoami.metadata.object; if (entity === 'user') {