← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal

« back to all changes in this revision

Viewing changes to django/contrib/auth/views.py

  • Committer: Bazaar Package Importer
  • Author(s): Chris Lamb
  • Date: 2009-07-29 11:26:28 UTC
  • mfrom: (1.1.8 upstream) (4.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090729112628-pg09ino8sz0sj21t
Tags: 1.1-1
http://bugs.debian.org/538863
* New upstream release.
* Merge from experimental:
  - Ship FastCGI initscript and /etc/default file in python-django's examples
    directory (Closes: #538863)
  - Drop "05_10539-sphinx06-compatibility.diff"; it has been applied
    upstream.
  - Bump Standards-Version to 3.8.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/contrib/auth/views.py
38
38
    return render_to_response(template_name, {
39
39
        'form': form,
40
40
        redirect_field_name: redirect_to,
 
41
        'site': current_site,
41
42
        'site_name': current_site.name,
42
43
    }, context_instance=RequestContext(request))
43
44
login = never_cache(login)
44
45
 
45
 
def logout(request, next_page=None, template_name='registration/logged_out.html'):
 
46
def logout(request, next_page=None, template_name='registration/logged_out.html', redirect_field_name=REDIRECT_FIELD_NAME):
46
47
    "Logs out the user and displays 'You are logged out' message."
47
48
    from django.contrib.auth import logout
48
49
    logout(request)
49
50
    if next_page is None:
50
 
        return render_to_response(template_name, {'title': _('Logged out')}, context_instance=RequestContext(request))
 
51
        redirect_to = request.REQUEST.get(redirect_field_name, '')
 
52
        if redirect_to:
 
53
            return HttpResponseRedirect(redirect_to)
 
54
        else:
 
55
            return render_to_response(template_name, {
 
56
                'title': _('Logged out')
 
57
            }, context_instance=RequestContext(request))
51
58
    else:
52
59
        # Redirect to this page until the session has been cleared.
53
60
        return HttpResponseRedirect(next_page or request.path)