haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00
Code Issues Releases Wiki Activity

Remove sending email after registration, and clean code

Browse Source
This commit is contained in:
xiez
2012-04-21 11:05:59 +08:00
parent 62bf4b11ce
commit 00f9575c74
8 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
thirdpart/registration/models.py
View File

@@ -61,9 +61,9 @@ class RegistrationManager(models.Manager):
profile.save()
return ccnetuser
return False
def create_inactive_user(self, username, email, password,
site, send_email=True):
def create_email_user(self, username, email, password,
site, send_email=True, is_active=False):
"""
Create a new, inactive ``User``, generate a
``RegistrationProfile`` and email its activation key to the
@@ -73,11 +73,10 @@ class RegistrationManager(models.Manager):
user. To disable this, pass ``send_email=False``.
"""
from seahub.base.accounts import CcnetUser
ccnetuser = CcnetUser.objects.create_user(username, password, False, False)
ccnetuser.is_active = False
ccnetuser.is_active = is_active
ccnetuser.save()
registration_profile = self.create_profile(ccnetuser)
@@ -86,6 +85,19 @@ class RegistrationManager(models.Manager):
registration_profile.send_activation_email(site)
return ccnetuser
def create_inactive_user(self, username, email, password,
site, send_email=True):
return self.create_email_user(username, email, password, site,
send_email, is_active=False)
create_inactive_user = transaction.commit_on_success(create_inactive_user)
def create_active_user(self, username, email, password,
site, send_email=True):
return self.create_email_user(username, email, password, site,
send_email, is_active=True)
create_inactive_user = transaction.commit_on_success(create_inactive_user)
def create_profile(self, user):