Mercurial > kallithea

diff rhodecode/model/user.py @ 1950:4ae17f819ee8 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#344 optional firstname lastname on user creation - on display fallback to username if both empty
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 27 Jan 2012 04:46:00 +0200
parents 89efedac4e6c
children a76e9bacbedc
line wrap: on
line diff
--- a/rhodecode/model/user.py	Fri Jan 27 04:14:01 2012 +0200
+++ b/rhodecode/model/user.py	Fri Jan 27 04:46:00 2012 +0200
@@ -92,7 +92,6 @@
             log.error(traceback.format_exc())
             raise
 
-
     def create_or_update(self, username, password, email, name, lastname,
                          active=True, admin=False, ldap_dn=None):
         """
@@ -136,7 +135,6 @@
             log.error(traceback.format_exc())
             raise
 
-
     def create_for_container_auth(self, username, attrs):
         """
         Creates the given user if it's not already in the database
@@ -231,7 +229,7 @@
             body = body % (new_user.username, new_user.full_name,
                            new_user.email)
             edit_url = url('edit_user', id=new_user.user_id, qualified=True)
-            kw = {'registered_user_url':edit_url}
+            kw = {'registered_user_url': edit_url}
             NotificationModel().create(created_by=new_user, subject=subject,
                                        body=body, recipients=None,
                                        type_=Notification.TYPE_REGISTRATION,
@@ -493,7 +491,6 @@
         new.permission = perm
         self.sa.add(new)
 
-
     def revoke_perm(self, user, perm):
         if not isinstance(perm, Permission):
             raise Exception('perm needs to be an instance of Permission class '