AMBARI-1282. Admin user can lose its own admin privilege. (Jaimin Jetly via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1440240 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -185,6 +185,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1282. Admin user can lose its own admin privilege. (Jaimin Jetly
+ via yusaku)
+
  AMBARI-1292. Add hosts should skip host checks on existing list of cluster
  nodes. (srimanth via yusaku)
 

ambari-web/app/models/user.js

@@ -49,7 +49,7 @@ App.EditUserForm = App.Form.extend({
 
   fieldsOptions:[
     { name:"userName", displayName:"Username" },
-    { name:"old_password", displayName:"Old Password", displayType:"password", isRequired: function(){ return this.get('form.isObjectNew'); }.property('form.isObjectNew') },
+    { name:"old_password", displayName:"Current Password", displayType:"password", isRequired: function(){ return this.get('form.isObjectNew'); }.property('form.isObjectNew') },
     { name:"new_password", displayName:"New Password", displayType:"password",  isRequired: false },
     { name:"admin", displayName:"Admin", displayType:"checkbox", isRequired:false },
     { name:"roles", displayName:"Role", isRequired:false, isHidden:true },

ambari-web/app/views/main/admin/user/edit.js

@@ -28,7 +28,7 @@ App.MainAdminUserEditView = Em.View.extend({
       var Users={};
       if(form.getField("admin").get('value') === "" || form.getField("admin").get('value') == true) {
         form.getField("roles").set("value","admin,user");
-        form.getField("admin").set("value","true");
+        form.getField("admin").set("value", true);
       } else{
         form.getField("roles").set("value","user");
       }