diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:15:48 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:15:48 +0100 |
| commit | 625b2156e388a92d57fa446c931bbf410f5a4e29 (patch) | |
| tree | 8866421569ba567be82b58a45d90e142c46e5c0a /registration/models.py | |
| parent | 1a36856b407684a9d48f04e170a160b3c04aa706 (diff) | |
| download | troggle-625b2156e388a92d57fa446c931bbf410f5a4e29.tar.gz troggle-625b2156e388a92d57fa446c931bbf410f5a4e29.tar.bz2 troggle-625b2156e388a92d57fa446c931bbf410f5a4e29.zip | |
[svn] Weeks of local changes.
- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM
Diffstat (limited to 'registration/models.py')
| -rw-r--r-- | registration/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/registration/models.py b/registration/models.py index 4a211c1..d7e4544 100644 --- a/registration/models.py +++ b/registration/models.py @@ -121,14 +121,14 @@ class RegistrationManager(models.Manager): current_site = Site.objects.get_current() subject = render_to_string('registration/activation_email_subject.txt', - { 'site': current_site }) + { 'site': settings.URL_ROOT }) # Email subject *must not* contain newlines subject = ''.join(subject.splitlines()) message = render_to_string('registration/activation_email.txt', { 'activation_key': registration_profile.activation_key, 'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS, - 'site': current_site }) + 'site': settings.URL_ROOT }) send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [new_user.email]) user_registered.send(sender=self.model, user=new_user) |