Author: yusaku
Date: Wed Jan 30 01:43:08 2013
New Revision: 1440240
URL: http://svn.apache.org/viewvc?rev=1440240&view=rev
Log:
AMBARI-1282. Admin user can lose its own admin privilege. (Jaimin Jetly via
yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/models/user.js
incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1440240&r1=1440239&r2=1440240&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Jan 30 01:43:08 2013
@@ -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)
Modified: incubator/ambari/trunk/ambari-web/app/models/user.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/user.js?rev=1440240&r1=1440239&r2=1440240&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/user.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/user.js Wed Jan 30 01:43:08
2013
@@ -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 },
Modified: incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js?rev=1440240&r1=1440239&r2=1440240&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js
(original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js Wed Jan
30 01:43:08 2013
@@ -28,7 +28,7 @@ App.MainAdminUserEditView = Em.View.exte
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");
}
