svn commit: r1479657 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/config.js ambari-web/app/messages.js ambari-web/app/models/user.js ambari-web/app/templates/main/admin/user.hbs ambari-web/app/views/main/admin/user/edit.js

[yu...@apache.org]

Author: yusaku
Date: Mon May  6 17:55:12 2013
New Revision: 1479657

URL: http://svn.apache.org/r1479657
Log:
AMBARI-2075. Admin role can't be assigned to LDAP user. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/config.js
    incubator/ambari/trunk/ambari-web/app/messages.js
    incubator/ambari/trunk/ambari-web/app/models/user.js
    incubator/ambari/trunk/ambari-web/app/templates/main/admin/user.hbs
    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=1479657&r1=1479656&r2=1479657&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon May  6 17:55:12 2013
@@ -828,6 +828,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2075. Admin role can't be assigned to LDAP user. (yusaku)
+
  AMBARI-2080. Cluster name and Background operations indicator should
  disappear on logout. (jaimin)
 

Modified: incubator/ambari/trunk/ambari-web/app/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/config.js?rev=1479657&r1=1479656&r2=1479657&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/config.js Mon May  6 17:55:12 2013
@@ -51,7 +51,8 @@ App.supports = {
   multipleHBaseMasters: false,
   addMasters: false,
   customizeSmokeTestUser: false,
-  hue: false
+  hue: false,
+  ldapGroupMapping: false
 };
 
 if (App.enableExperimental) {

Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1479657&r1=1479656&r2=1479657&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Mon May  6 17:55:12 2013
@@ -571,7 +571,7 @@ Em.I18n.translations = {
   'admin.addSecurity.apply.stage5': '5. Smoke Test',
   'admin.removeSecurity.header': 'Disable Security',
   'admin.security.status.error' : 'Error in retrieving cluster security status from Ambari server',
-  'admin.users.ldapAuthentionUsed':'LDAP Authentication is being used to authenticate users',
+  'admin.users.ldapAuthUsed':'LDAP Authentication is being used to authenticate users',
   'admin.users.delete.yourself.message':'You can\'t delete yourself',
   'admin.users.delete.yourself.header':'Deleting warning',
 

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=1479657&r1=1479656&r2=1479657&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/user.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/user.js Mon May  6 17:55:12 2013
@@ -62,7 +62,7 @@ App.EditUserForm = App.Form.extend({
   disableAdminCheckbox:function () {
     var object = this.get('object');
     if (object) {
-      if((object.get('userName') == App.get('router').getLoginName()) || object.get("isLdap")){
+      if ((object.get('userName') == App.get('router').getLoginName()) || App.supports.ldapGroupMapping && object.get("isLdap")) {
         this.getField("admin").set("disabled", true);
       } else {
         this.getField("admin").set("disabled", false);

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/admin/user.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/admin/user.hbs?rev=1479657&r1=1479656&r2=1479657&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/admin/user.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/admin/user.hbs Mon May  6 17:55:12 2013
@@ -17,7 +17,7 @@
 }}
 
 {{#if view.ldapUser}}
-<p class="text-info">{{t admin.users.ldapAuthentionUsed}}.</p>
+<p class="text-info">{{t admin.users.ldapAuthUsed}}.</p>
 {{else}}
 <table class="table table-bordered table-striped span6">
   <thead>

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=1479657&r1=1479656&r2=1479657&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 Mon May  6 17:55:12 2013
@@ -67,7 +67,7 @@ App.MainAdminUserEditView = Em.View.exte
 
   didInsertElement: function() {
     var form = this.get('userForm');
-    if(form.getField("isLdap").get("value")) {
+    if (form.getField("isLdap").get("value")) {
       form.getField("old_password").set("disabled",true);
       form.getField("new_password").set("disabled",true);
     }