kallithea Changeset - 727d2a45ec10

Changeset - 727d2a45ec10

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 12 years ago 2013-06-18 21:54:14
marcin@python-works.com

Replaced fallback username from ? to None in hook loggers

2 files changed with 6 insertions and 6 deletions:

rhodecode/model/repo.py

rhodecode/model/user.py

0 comments (0 inline, 0 general)

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -515,7 +515,7 @@ class RepoModel(BaseModel): @@
         :param fs_remove: remove(archive) repo from filesystem
         """
         if not cur_user:
-            cur_user = getattr(get_current_rhodecode_user(), 'username', '?')
+            cur_user = getattr(get_current_rhodecode_user(), 'username', None)
         repo = self._get_repo(repo)
         if repo:
             if forks == 'detach':

rhodecode/model/user.py

➞

Show inline comments

@@ @@ -83,7 +83,7 @@ class UserModel(BaseModel): @@
     def create(self, form_data, cur_user=None):
         if not cur_user:
-            cur_user = getattr(get_current_rhodecode_user(), 'username', '?')
+            cur_user = getattr(get_current_rhodecode_user(), 'username', None)
         from rhodecode.lib.auth import get_crypt_password
         try:
             new_user = User()
@@ @@ -120,7 +120,7 @@ class UserModel(BaseModel): @@
         :param ldap_dn:
         """
         if not cur_user:
-            cur_user = getattr(get_current_rhodecode_user(), 'username', '?')
+            cur_user = getattr(get_current_rhodecode_user(), 'username', None)
         from rhodecode.lib.auth import get_crypt_password
@@ @@ -165,7 +165,7 @@ class UserModel(BaseModel): @@
         :param attrs:
         """
         if not cur_user:
-            cur_user = getattr(get_current_rhodecode_user(), 'username', '?')
+            cur_user = getattr(get_current_rhodecode_user(), 'username', None)
         if self.get_by_username(username, case_insensitive=True) is None:
             # autogenerate email for container account without one
@@ @@ -205,7 +205,7 @@ class UserModel(BaseModel): @@
         :param attrs:
         """
         if not cur_user:
-            cur_user = getattr(get_current_rhodecode_user(), 'username', '?')
+            cur_user = getattr(get_current_rhodecode_user(), 'username', None)
         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:
@@ @@ -317,7 +317,7 @@ class UserModel(BaseModel): @@
     def delete(self, user, cur_user=None):
         if not cur_user:
-            cur_user = getattr(get_current_rhodecode_user(), 'username', '?')
+            cur_user = getattr(get_current_rhodecode_user(), 'username', None)
         user = self._get_user(user)
         try:

0 comments (0 inline, 0 general)