fixes #762, LDAP and container created users are now activated based on

the registration settings in permissions

rhodecode/controllers/login.py

@@ -126,20 +126,16 b' class LoginController(BaseController):'
     @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate',
                                'hg.register.manual_activate')
     def register(self):
-        c.auto_active = False
-        for perm in User.get_by_username('default').user_perms:
-            if perm.permission.permission_name == 'hg.register.auto_activate':
-                c.auto_active = True
-                break
+        c.auto_active = 'hg.register.auto_activate' in User.get_by_username('default')\
+            .AuthUser.permissions['global']
 
         if request.POST:
-
             register_form = RegisterForm()()
             try:
                 form_result = register_form.to_python(dict(request.POST))
                 form_result['active'] = c.auto_active
                 UserModel().create_registration(form_result)
-                h.flash(_('You have successfully registered into rhodecode'),
+                h.flash(_('You have successfully registered into RhodeCode'),
                             category='success')
                 Session().commit()
                 return redirect(url('login_home'))

rhodecode/lib/auth.py

@@ -226,6 +226,8 b' def authenticate(username, password):'
                  'name': safe_unicode(get_ldap_attr('ldap_attr_firstname')),
                  'lastname': safe_unicode(get_ldap_attr('ldap_attr_lastname')),
                  'email': get_ldap_attr('ldap_attr_email'),
+                 'active': 'hg.register.auto_activate' in User\
+                    .get_by_username('default').AuthUser.permissions['global']
                 }
 
                 # don't store LDAP password since we don't need it. Override
@@ -254,6 +256,8 b' def login_container_auth(username):'
             'name': username,
             'lastname': None,
             'email': None,
+            'active': 'hg.register.auto_activate' in User\
+               .get_by_username('default').AuthUser.permissions['global']
         }
         user = UserModel().create_for_container_auth(username, user_attrs)
         if not user:

rhodecode/model/db.py

@@ -399,6 +399,15 b' class User(Base, BaseModel):'
     def is_admin(self):
         return self.admin
 
+    @property
+    def AuthUser(self):
+        """
+        Returns instance of AuthUser for this user
+        """
+        from rhodecode.lib.auth import AuthUser
+        return AuthUser(user_id=self.user_id, api_key=self.api_key,
+                        username=self.username)
+
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                      self.user_id, self.username)