From 29bc4045aebbe06c9c4dc6985749b809b12d785e Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvoborni@redhat.com>
Date: Tue, 14 Jul 2015 17:55:48 +0200
Subject: [PATCH] webui: fix user reset password dialog

Could not open user password dialog.

regression introduced in ed78dcfa3acde7aeb1f381f49988c6911c5277ee

https://fedorahosted.org/freeipa/ticket/5131

Reviewed-By: Martin Basti <mbasti@redhat.com>
---
 install/ui/src/freeipa/dialogs/password.js | 1 -
 install/ui/src/freeipa/user.js             | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/ui/src/freeipa/dialogs/password.js b/install/ui/src/freeipa/dialogs/password.js
index f25f7ac60477b1c85b5a6ede23cd93724a89e642..aa9bf44fc49b890fb5393119335b13c622f48879 100644
--- a/install/ui/src/freeipa/dialogs/password.js
+++ b/install/ui/src/freeipa/dialogs/password.js
@@ -48,7 +48,6 @@ dialogs.password.default_fields_pre_op =  function(spec) {
 
     spec.title = spec.title || '@i18n:password.reset_password';
     spec.width = spec.width || 400;
-    spec.method = spec.method || 'mod';
     spec.success_message = spec.success_message || '@i18n:password.password_change_complete';
     spec.confirm_button_label = spec.confirm_button_label || '@i18n:password.reset_password';
     spec.sections = spec.sections || [
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
index e30311bbf0763d9efbc38fdb19e80e114e7636c9..0e828c16b999ffd58504bc4e53d2748bcd16b042 100644
--- a/install/ui/src/freeipa/user.js
+++ b/install/ui/src/freeipa/user.js
@@ -29,13 +29,14 @@ define([
         './reg',
         './rpc',
         './text',
+        './dialog',
         './dialogs/password',
         './details',
         './search',
         './association',
         './entity',
         './certificate'],
-    function(builder, IPA, $, phases, reg, rpc, text, password_dialog) {
+    function(builder, IPA, $, phases, reg, rpc, text, dialogs) {
 
 /**
  * User module
@@ -638,7 +639,7 @@ IPA.user.password_dialog_pre_op = function(spec) {
 
 IPA.user.password_dialog = function(spec) {
 
-    var that = password_dialog.dialog(spec);
+    var that = dialogs.command_dialog(spec);
 
     that.is_self_service = function() {
         var self_service = that.args[0] === IPA.whoami.uid[0];
-- 
2.4.3