diff rhodecode/model/user.py @ 1594:9dae92a65e40 beta

fixes #288 - added group management into non admin repo settings form - fixes also issues with groups after API codes merge - all tests passes ok.
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 24 Oct 2011 22:40:43 +0200
parents 92a4f7c496a5
children 9353189b7675 b8cde49f5e5b 95c3e33ef32e
line wrap: on
line diff
--- a/rhodecode/model/user.py	Sun Oct 23 01:16:55 2011 +0200
+++ b/rhodecode/model/user.py	Mon Oct 24 22:40:43 2011 +0200
@@ -49,14 +49,14 @@
 
 
 class UserModel(BaseModel):
-    def get(self, user_id, cache = False):
+    def get(self, user_id, cache=False):
         user = self.sa.query(User)
         if cache:
             user = user.options(FromCache("sql_cache_short",
                                           "get_user_%s" % user_id))
         return user.get(user_id)
 
-    def get_by_username(self, username, cache = False, case_insensitive = False):
+    def get_by_username(self, username, cache=False, case_insensitive=False):
 
         if case_insensitive:
             user = self.sa.query(User).filter(User.username.ilike(username))
@@ -68,7 +68,7 @@
                                           "get_user_%s" % username))
         return user.scalar()
 
-    def get_by_api_key(self, api_key, cache = False):
+    def get_by_api_key(self, api_key, cache=False):
 
         user = self.sa.query(User)\
                 .filter(User.api_key == api_key)
@@ -96,6 +96,7 @@
         """
         Checks if user is in database, if not creates this user marked
         as ldap user
+        
         :param username:
         :param password:
         :param user_dn:
@@ -103,7 +104,7 @@
         """
         from rhodecode.lib.auth import get_crypt_password
         log.debug('Checking for such ldap account in RhodeCode database')
-        if self.get_by_username(username, case_insensitive = True) is None:
+        if self.get_by_username(username, case_insensitive=True) is None:
             try:
                 new_user = User()
                 # add ldap account always lowercase
@@ -152,7 +153,7 @@
 
     def update(self, user_id, form_data):
         try:
-            user = self.get(user_id, cache = False)
+            user = self.get(user_id, cache=False)
             if user.username == 'default':
                 raise DefaultUserException(
                                 _("You can't Edit this user since it's"
@@ -174,7 +175,7 @@
 
     def update_my_account(self, user_id, form_data):
         try:
-            user = self.get(user_id, cache = False)
+            user = self.get(user_id, cache=False)
             if user.username == 'default':
                 raise DefaultUserException(
                                 _("You can't Edit this user since it's"
@@ -196,7 +197,7 @@
 
     def delete(self, user_id):
         try:
-            user = self.get(user_id, cache = False)
+            user = self.get(user_id, cache=False)
             if user.username == 'default':
                 raise DefaultUserException(
                                 _("You can't remove this user since it's"
@@ -222,7 +223,7 @@
         from rhodecode.lib.celerylib import tasks, run_task
         run_task(tasks.reset_user_password, data['email'])
 
-    def fill_data(self, auth_user, user_id = None, api_key = None):
+    def fill_data(self, auth_user, user_id=None, api_key=None):
         """
         Fetches auth_user by user_id,or api_key if present.
         Fills auth_user attributes with those taken from database.
@@ -268,7 +269,7 @@
         #======================================================================
         # fetch default permissions
         #======================================================================
-        default_user = self.get_by_username('default', cache = True)
+        default_user = self.get_by_username('default', cache=True)
 
         default_perms = self.sa.query(RepoToPerm, Repository, Permission)\
             .join((Repository, RepoToPerm.repository_id ==
@@ -386,3 +387,4 @@
                                                      repository.repo_name] = p
 
         return user
+