From ff11d6619f33baa6e6b9ccec509ae73132b69cb4 Mon Sep 17 00:00:00 2001
From: Sebastian Gierlinger <s.gierlinger@me.com>
Date: Thu, 11 Dec 2014 21:23:07 +0100
Subject: [PATCH] Password change MU

closes #4624
- added user_id to password reset request
- hide old password field
- updated changePassword method to check permissions
- updated changePassword method to work without oldPassword
- fixed bug for errors shown as [Object object]
---
 ghost/admin/models/user.js                    | 1 +
 ghost/admin/templates/settings/users/user.hbs | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ghost/admin/models/user.js b/ghost/admin/models/user.js
index ff03b847c1..e6e7e11169 100644
--- a/ghost/admin/models/user.js
+++ b/ghost/admin/models/user.js
@@ -52,6 +52,7 @@ var User = DS.Model.extend(NProgressSaveMixin, SelectiveSaveMixin, ValidationEng
             type: 'PUT',
             data: {
                 password: [{
+                    user_id: this.get('id'),
                     oldPassword: this.get('password'),
                     newPassword: this.get('newPassword'),
                     ne2Password: this.get('ne2Password')
diff --git a/ghost/admin/templates/settings/users/user.hbs b/ghost/admin/templates/settings/users/user.hbs
index 6e6f75c06b..cab93006c5 100644
--- a/ghost/admin/templates/settings/users/user.hbs
+++ b/ghost/admin/templates/settings/users/user.hbs
@@ -96,11 +96,12 @@
         </fieldset>
 
         <fieldset>
-
+            {{#unless view.isNotOwnProfile}}
             <div class="form-group">
                 <label for="user-password-old">Old Password</label>
                 {{input value=user.password type="password" id="user-password-old"}}
             </div>
+            {{/unless}}
 
             <div class="form-group">
                 <label for="user-password-new">New Password</label>