AMBARI-13853. UI should not use ldap_user field after introducing user_type one.

ambari-web/app/mappers/users_mapper.js

@@ -23,10 +23,10 @@ App.usersMapper = App.QuickDataMapper.create({
   config : {
     id : 'Users.user_name',
     user_name : 'Users.user_name',
-    is_ldap: 'Users.ldap_user',
     admin: 'Users.admin',
     operator: 'Users.operator',
-    permissions: 'permissions'
+    permissions: 'permissions',
+    user_type: 'Users.user_type'
   },
   map: function (json) {
     var self = this;

ambari-web/app/models/user.js

@@ -24,13 +24,7 @@ App.User = DS.Model.extend({
   id:function(){
     return this.get('userName');
   }.property('userName'),
-  isLdap:DS.attr('boolean'),
-  type: function(){
-    if(this.get('isLdap')){
-      return 'LDAP';
-    }
-    return 'Local';
-  }.property('isLdap'),
+  userType: DS.attr('string'),
   auditItems:DS.hasMany('App.ServiceAudit'),
   admin: DS.attr('boolean'),
   operator: DS.attr('boolean'),
@@ -43,7 +37,14 @@ App.User = DS.Model.extend({
    *    VIEW.USE
    * @property {Array} permissions
    **/
-  permissions: DS.attr('array')
+  permissions: DS.attr('array'),
+
+  /**
+   * @type {Boolean}
+   */
+  isLdap: function() {
+    return this.get('userType') === 'LDAP';
+  }.property('userType')
 });
 
 App.EditUserForm = App.Form.extend({
@@ -78,7 +79,6 @@ App.EditUserForm = App.Form.extend({
   isValid:function () {
 
     var isValid = this._super();
-    var thisForm = this;
 
     var newPass = this.get('field.new_password');
     var oldPass = this.get('field.old_password');

ambari-web/test/models/user_test.js

@@ -49,17 +49,16 @@ describe('App.User', function () {
     });
   });
 
-  describe('#type', function () {
-    it('should be LDAP', function () {
-      user.set('isLdap', true);
-      expect(user.get('type')).to.equal('LDAP');
+  describe('#isLdap', function() {
+    it('User userType value is "LDAP" should return "true"', function() {
+      user.set('userType', 'LDAP');
+      expect(user.get('isLdap')).to.be.true;
     });
-    it('should be Local', function () {
-      user.set('isLdap', false);
-      expect(user.get('type')).to.equal('Local');
+    it('User userType value is "LOCAL" should return "false"', function() {
+      user.set('userType', 'LOCAL');
+      expect(user.get('isLdap')).to.be.false;
     });
   });
-
 });
 
 describe('App.EditUserForm', function () {