From 00b0b9139773dcdbdfe4b5ab2857471d0c420fcf Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Thu, 11 Sep 2014 15:39:30 +0200 Subject: [PATCH 5/6] django.contrib.sites removed from registration backend --- authentic2/registration_backend/views.py | 8 +------- authentic2/templates/registration/activation_email.txt | 4 ++-- authentic2/templates/registration/activation_email_subject.txt | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/authentic2/registration_backend/views.py b/authentic2/registration_backend/views.py index 5c4cd53..d7e3eeb 100644 --- a/authentic2/registration_backend/views.py +++ b/authentic2/registration_backend/views.py @@ -4,7 +4,6 @@ from datetime import datetime from django.shortcuts import redirect, render from django.utils.translation import ugettext as _ from django.contrib import messages -from django.contrib.sites.models import Site, RequestSite from django.contrib.auth.models import BaseUserManager, Group from django.contrib.auth import authenticate, login from django.conf import settings @@ -30,15 +29,10 @@ class RegistrationView(FormView): template_name = 'registration/registration_form.html' def form_valid(self, form): - if Site._meta.installed: - site = Site.objects.get_current() - else: - site = RequestSite(self.request) - activation_key = signing.dumps(form.cleaned_data) ctx_dict = {'activation_key': activation_key, 'expiration_days': EXPIRATION, - 'site': site} + 'site': self.request.get_host()} ctx_dict.update(form.cleaned_data) subject = render_to_string('registration/activation_email_subject.txt', diff --git a/authentic2/templates/registration/activation_email.txt b/authentic2/templates/registration/activation_email.txt index 911df01..ebdc26b 100644 --- a/authentic2/templates/registration/activation_email.txt +++ b/authentic2/templates/registration/activation_email.txt @@ -1,6 +1,6 @@ {% load i18n %} -{% trans "Activate account at" %} {{ site.name }}: +{% trans "Activate account at" %} {{ site }}: -http://{{ site.domain }}{% url 'registration_activate' activation_key %} +http://{{ site }}{% url 'registration_activate' activation_key %} {% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %} diff --git a/authentic2/templates/registration/activation_email_subject.txt b/authentic2/templates/registration/activation_email_subject.txt index 24f477c..7c30228 100644 --- a/authentic2/templates/registration/activation_email_subject.txt +++ b/authentic2/templates/registration/activation_email_subject.txt @@ -1 +1 @@ -{% load i18n %}{% trans "Account activation on" %} {{ site.name }} +{% load i18n %}{% trans "Account activation on" %} {{ site }} -- 2.1.0