Projet

Général

Profil

0002-django.contrib.sites-removed-from-registration-backe.patch

Serghei Mihai (congés, retour 15/05), 11 septembre 2014 15:45

Télécharger (2,82 ko)

Voir les différences: 

Subject: [PATCH 2/3] 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(-)
authentic2/registration_backend/views.py
4 4 
from django.shortcuts import redirect, render
5 5 
from django.utils.translation import ugettext as _
6 6 
from django.contrib import messages
7 
from django.contrib.sites.models import Site, RequestSite
8 7 
from django.contrib.auth.models import BaseUserManager, Group
9 8 
from django.contrib.auth import authenticate, login
10 9 
from django.conf import settings
......
30 29 
    template_name = 'registration/registration_form.html'
31 30 

  		




  32
  31
  
    
    def form_valid(self, form):

  		




  33
  
  
    
        if Site._meta.installed:

  		




  34
  
  
    
            site = Site.objects.get_current()

  		




  35
  
  
    
        else:

  		




  36
  
  
    
            site = RequestSite(self.request)

  		




  37
  
  
    

  		




  38
  32
  
    
        activation_key = signing.dumps(form.cleaned_data)

  		




  39
  33
  
    
        ctx_dict = {'activation_key': activation_key,

  		




  40
  34
  
    
                    'expiration_days': EXPIRATION,

  		




  41
  
  
    
                    'site': site}

  		




  
  35
  
    
                    'site': self.request.get_host()}

  		




  42
  36
  
    
        ctx_dict.update(form.cleaned_data)

  		




  43
  37
  
    

  		




  44
  38
  
    
        subject = render_to_string('registration/activation_email_subject.txt',

  		












  

    
      authentic2/templates/registration/activation_email.txt
    
  





  1
  1
  
    
{% load i18n %}

  		




  2
  
  
    
{% trans "Activate account at" %} {{ site.name }}:

  		




  
  2
  
    
{% trans "Activate account at" %} {{ site }}:

  		




  3
  3
  
    

  		




  4
  
  
    
http://{{ site.domain }}{% url 'registration_activate' activation_key %}

  		




  
  4
  
    
http://{{ site }}{% url 'registration_activate' activation_key %}

  		




  5
  5
  
    

  		




  6
  6
  
    
{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %}

  		












  

    
      authentic2/templates/registration/activation_email_subject.txt
    
  





  1
  
  
    
{% load i18n %}{% trans "Account activation on" %} {{ site.name }}

  		




  
  1
  
    
{% load i18n %}{% trans "Account activation on" %} {{ site }}

  		




  2
  
  
    
-