From 9dabad02533833dd48389bf233c6236b5eda64de Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Fri, 6 Dec 2013 12:33:20 -0800
Subject: [PATCH] Fix broken change password UI

---
 ui/scripts/accounts.js | 105 +++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 72bc00f7576..8780206521c 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -1135,59 +1135,62 @@
                                     }
                                 },
 
-				action: function(args) {
-				    if (isLdapEnabled()) {
-					alert(dictionary["error.could.not.change.your.password.because.ldap.is.enabled"]);
-					args.response.error({});
-				    } else {
-					cloudStack.dialog.createForm({
-					    noDialog: false,
-					    form: {
-						title: 'label.action.change.password',
-						fields: {
-						    newPassword: {
-							label: 'label.new.password',
-							isPassword: true,
-							validation: {
-							    required: true
-							},
-							id: 'newPassword'
-						    },
-						    'password-confirm': {
-							label: 'label.confirm.password',
-							validation: {
-							    required: true,
-							    equalTo: '#newPassword'
-							},
-							isPassword: true
-						    }
-						}
-					    }
-					})
-					var password = args.data.newPassword;
-					if (md5Hashed)
-					    password = $.md5(password);
+                                action: {
+                                    custom: function(args) {
+                                        var start = args.start;
+                                        var complete = args.complete;
+                                        var context = args.context;
 
-					var data = {
-					    id: args.context.users[0].id,
-					    password: password
-					};
-					$.ajax({
-					    url: createURL('updateUser'),
-					    data: data,
-					    type: "POST",
-					    success: function(json) {
-						args.response.success({
-						    data: json.updateuserresponse.user
-						});
-					    }
-					});
+                                        if (isLdapEnabled()) {
+                                            cloudStack.dialog.notice({ message: _l('error.could.not.change.your.password.because.ldap.is.enabled') });
+                                        } else {
+                                            cloudStack.dialog.createForm({
+                                                form: {
+                                                    title: 'label.action.change.password',
+                                                    fields: {
+                                                        newPassword: {
+                                                            label: 'label.new.password',
+                                                            isPassword: true,
+                                                            validation: {
+                                                                required: true
+                                                            },
+                                                            id: 'newPassword'
+                                                        },
+                                                        'password-confirm': {
+                                                            label: 'label.confirm.password',
+                                                            validation: {
+                                                                required: true,
+                                                                equalTo: '#newPassword'
+                                                            },
+                                                            isPassword: true
+                                                        }
+                                                    }
+                                                },
+                                                after: function(args) {
+                                                    start();
 
-				    }
-                                },
-                                notification: {
-                                    poll: function(args) {
-                                        args.complete();
+                                                    var password = args.data.newPassword;
+
+                                                    if (md5Hashed)
+                                                        password = $.md5(password);
+
+                                                    $.ajax({
+                                                        url: createURL('updateUser'),
+                                                        data: {
+                                                            id: context.users[0].id,
+                                                            password: password
+                                                        },
+                                                        type: "POST",
+                                                        success: function(json) {
+                                                            complete();
+                                                        },
+                                                        error: function(json) {
+                                                            complete({ error: parseXMLHttpResponse(json) });
+                                                        }
+                                                    });
+                                                }
+                                            });
+                                        }
                                     }
                                 }
                             },