Django

Code

Show
Ignore:
Timestamp:
06/26/08 10:42:33 (7 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7766].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7729 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7768

  • django/branches/newforms-admin/django/contrib/auth/views.py

    r7735 r7770  
     1from django.contrib.auth import REDIRECT_FIELD_NAME 
     2from django.contrib.auth.decorators import login_required 
    13from django.contrib.auth.forms import AuthenticationForm 
    24from django.contrib.auth.forms import PasswordResetForm, PasswordChangeForm, AdminPasswordChangeForm 
    35from django.core.exceptions import PermissionDenied 
    46from django.shortcuts import render_to_response, get_object_or_404 
    5 from django.template import RequestContext 
    67from django.contrib.sites.models import Site, RequestSite 
    78from django.http import HttpResponseRedirect 
    8 from django.contrib.auth.decorators import login_required 
    9 from django.contrib.auth import REDIRECT_FIELD_NAME 
     9from django.template import RequestContext 
     10from django.utils.http import urlquote 
    1011from django.utils.html import escape 
    1112from django.utils.translation import ugettext as _ 
    …… 
    6364        from django.conf import settings 
    6465        login_url = settings.LOGIN_URL 
    65     return HttpResponseRedirect('%s?%s=%s' % (login_url, redirect_field_name, next)) 
     66    return HttpResponseRedirect('%s?%s=%s' % (login_url, urlquote(redirect_field_name), urlquote(next))) 
    6667 
    6768def password_reset(request, is_admin_site=False, template_name='registration/password_reset_form.html', 
    …… 
    7475                form.save(domain_override=request.META['HTTP_HOST']) 
    7576            else: 
    76                 form.save(email_template_name=email_template_name) 
     77                if Site._meta.installed: 
     78                    form.save(email_template_name=email_template_name) 
     79                else: 
     80                    form.save(domain_override=RequestSite(request).domain, email_template_name=email_template_name) 
    7781            return HttpResponseRedirect('%sdone/' % request.path) 
    7882    else: