85 lines
3.3 KiB
Diff
85 lines
3.3 KiB
Diff
|
From 8c242fd2cf2bbe14a4aae5d31d1f945901c72afb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pavel Vomacka <pvomacka@redhat.com>
|
||
|
|
Date: Wed, 6 Sep 2017 15:19:58 +0200
|
||
|
|
Subject: [PATCH 1/2] WebUI: remove unused parameter from get_whoami_command
|
||
|
|
|
||
|
|
The batch param is not used anywhere therefore we can remove it.
|
||
|
|
|
||
|
|
https://pagure.io/freeipa/issue/7143
|
||
|
|
---
|
||
|
|
install/ui/src/freeipa/ipa.js | 6 ++----
|
||
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js
|
||
|
|
index 2538001c94..3920b8eb0a 100644
|
||
|
|
--- a/install/ui/src/freeipa/ipa.js
|
||
|
|
+++ b/install/ui/src/freeipa/ipa.js
|
||
|
|
@@ -191,7 +191,7 @@ var IPA = function () {
|
||
|
|
}
|
||
|
|
}));
|
||
|
|
|
||
|
|
- batch.add_command(that.get_whoami_command(true));
|
||
|
|
+ batch.add_command(that.get_whoami_command());
|
||
|
|
|
||
|
|
batch.add_command(rpc.command({
|
||
|
|
method: 'env',
|
||
|
|
@@ -259,10 +259,8 @@ var IPA = function () {
|
||
|
|
/**
|
||
|
|
* Prepares `user-find --whoami` command
|
||
|
|
* @protected
|
||
|
|
- * @param {boolean} batch - Specifies if it will be used as single command or
|
||
|
|
- * in a batch.
|
||
|
|
*/
|
||
|
|
- that.get_whoami_command = function(batch) {
|
||
|
|
+ that.get_whoami_command = function() {
|
||
|
|
return rpc.command({
|
||
|
|
method: 'whoami',
|
||
|
|
on_success: function(data, text_status, xhr) {
|
||
|
|
|
||
|
|
From df34476d8bd7ac2de93588b4169e996605c85fe3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pavel Vomacka <pvomacka@redhat.com>
|
||
|
|
Date: Wed, 6 Sep 2017 15:20:07 +0200
|
||
|
|
Subject: [PATCH 2/2] 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
|
||
|
|
---
|
||
|
|
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 3920b8eb0a..138ca031b8 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') {
|