|
 |
590d18 |
From 29bc4045aebbe06c9c4dc6985749b809b12d785e Mon Sep 17 00:00:00 2001
|
|
|
590d18 |
From: Petr Vobornik <pvoborni@redhat.com>
|
|
|
590d18 |
Date: Tue, 14 Jul 2015 17:55:48 +0200
|
|
|
590d18 |
Subject: [PATCH] webui: fix user reset password dialog
|
|
|
590d18 |
|
|
|
590d18 |
Could not open user password dialog.
|
|
|
590d18 |
|
|
|
590d18 |
regression introduced in ed78dcfa3acde7aeb1f381f49988c6911c5277ee
|
|
|
590d18 |
|
|
|
590d18 |
https://fedorahosted.org/freeipa/ticket/5131
|
|
|
590d18 |
|
|
|
590d18 |
Reviewed-By: Martin Basti <mbasti@redhat.com>
|
|
|
590d18 |
---
|
|
|
590d18 |
install/ui/src/freeipa/dialogs/password.js | 1 -
|
|
|
590d18 |
install/ui/src/freeipa/user.js | 5 +++--
|
|
|
590d18 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
590d18 |
|
|
|
590d18 |
diff --git a/install/ui/src/freeipa/dialogs/password.js b/install/ui/src/freeipa/dialogs/password.js
|
|
|
590d18 |
index f25f7ac60477b1c85b5a6ede23cd93724a89e642..aa9bf44fc49b890fb5393119335b13c622f48879 100644
|
|
|
590d18 |
--- a/install/ui/src/freeipa/dialogs/password.js
|
|
|
590d18 |
+++ b/install/ui/src/freeipa/dialogs/password.js
|
|
|
590d18 |
@@ -48,7 +48,6 @@ dialogs.password.default_fields_pre_op = function(spec) {
|
|
|
590d18 |
|
|
|
590d18 |
spec.title = spec.title || '@i18n:password.reset_password';
|
|
|
590d18 |
spec.width = spec.width || 400;
|
|
|
590d18 |
- spec.method = spec.method || 'mod';
|
|
|
590d18 |
spec.success_message = spec.success_message || '@i18n:password.password_change_complete';
|
|
|
590d18 |
spec.confirm_button_label = spec.confirm_button_label || '@i18n:password.reset_password';
|
|
|
590d18 |
spec.sections = spec.sections || [
|
|
|
590d18 |
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
|
|
|
590d18 |
index e30311bbf0763d9efbc38fdb19e80e114e7636c9..0e828c16b999ffd58504bc4e53d2748bcd16b042 100644
|
|
|
590d18 |
--- a/install/ui/src/freeipa/user.js
|
|
|
590d18 |
+++ b/install/ui/src/freeipa/user.js
|
|
|
590d18 |
@@ -29,13 +29,14 @@ define([
|
|
|
590d18 |
'./reg',
|
|
|
590d18 |
'./rpc',
|
|
|
590d18 |
'./text',
|
|
|
590d18 |
+ './dialog',
|
|
|
590d18 |
'./dialogs/password',
|
|
|
590d18 |
'./details',
|
|
|
590d18 |
'./search',
|
|
|
590d18 |
'./association',
|
|
|
590d18 |
'./entity',
|
|
|
590d18 |
'./certificate'],
|
|
|
590d18 |
- function(builder, IPA, $, phases, reg, rpc, text, password_dialog) {
|
|
|
590d18 |
+ function(builder, IPA, $, phases, reg, rpc, text, dialogs) {
|
|
|
590d18 |
|
|
|
590d18 |
/**
|
|
|
590d18 |
* User module
|
|
|
590d18 |
@@ -638,7 +639,7 @@ IPA.user.password_dialog_pre_op = function(spec) {
|
|
|
590d18 |
|
|
|
590d18 |
IPA.user.password_dialog = function(spec) {
|
|
|
590d18 |
|
|
|
590d18 |
- var that = password_dialog.dialog(spec);
|
|
|
590d18 |
+ var that = dialogs.command_dialog(spec);
|
|
|
590d18 |
|
|
|
590d18 |
that.is_self_service = function() {
|
|
|
590d18 |
var self_service = that.args[0] === IPA.whoami.uid[0];
|
|
|
590d18 |
--
|
|
|
590d18 |
2.4.3
|
|
|
590d18 |
|