Ticket #5298: auth-extra-content-14586.diff

django/contrib/auth/views.py

@@ -22 +22 @@
 @never_cache
 def login(request, template_name='registration/login.html',
           redirect_field_name=REDIRECT_FIELD_NAME,
-          authentication_form=AuthenticationForm):
+          authentication_form=AuthenticationForm,
+          extra_context=None):
     """Displays the login form and handles the login action."""
 
     redirect_to = request.REQUEST.get(redirect_field_name, '')
@@ -61 +62 @@
         redirect_field_name: redirect_to,
         'site': current_site,
         'site_name': current_site.name,
-    }, context_instance=RequestContext(request))
+    }, context_instance=RequestContext(request, extra_context))
 
-def logout(request, next_page=None, template_name='registration/logged_out.html', redirect_field_name=REDIRECT_FIELD_NAME):
+def logout(request, next_page=None, template_name='registration/logged_out.html', redirect_field_name=REDIRECT_FIELD_NAME, extra_context=None):
     "Logs out the user and displays 'You are logged out' message."
     from django.contrib.auth import logout
     logout(request)
@@ -77 +78 @@
                 'site': current_site,
                 'site_name': current_site.name,
                 'title': _('Logged out')
-            }, context_instance=RequestContext(request))
+            }, context_instance=RequestContext(request, extra_context))
     else:
         # Redirect to this page until the session has been cleared.
         return HttpResponseRedirect(next_page or request.path)
 
-def logout_then_login(request, login_url=None):
+def logout_then_login(request, login_url=None, extra_context=None):
     "Logs out the user if he is logged in. Then redirects to the log-in page."
     if not login_url:
         login_url = settings.LOGIN_URL
-    return logout(request, login_url)
+    return logout(request, login_url, extra_context=extra_context)
 
 def redirect_to_login(next, login_url=None, redirect_field_name=REDIRECT_FIELD_NAME):
     "Redirects the user to the login page, passing the given 'next' page"
@@ -105 +106 @@
 def password_reset(request, is_admin_site=False, template_name='registration/password_reset_form.html',
         email_template_name='registration/password_reset_email.html',
         password_reset_form=PasswordResetForm, token_generator=default_token_generator,
-        post_reset_redirect=None, from_email=None):
+        post_reset_redirect=None, from_email=None, extra_context=None):
     if post_reset_redirect is None:
         post_reset_redirect = reverse('django.contrib.auth.views.password_reset_done')
     if request.method == "POST":
@@ -125 +126 @@
         form = password_reset_form()
     return render_to_response(template_name, {
         'form': form,
-    }, context_instance=RequestContext(request))
+    }, context_instance=RequestContext(request, extra_context))
 
-def password_reset_done(request, template_name='registration/password_reset_done.html'):
-    return render_to_response(template_name, context_instance=RequestContext(request))
+def password_reset_done(request, template_name='registration/password_reset_done.html', extra_context=None):
+    return render_to_response(template_name, context_instance=RequestContext(request, extra_context))
 
 # Doesn't need csrf_protect since no-one can guess the URL
 def password_reset_confirm(request, uidb36=None, token=None, template_name='registration/password_reset_confirm.html',
                            token_generator=default_token_generator, set_password_form=SetPasswordForm,
-                           post_reset_redirect=None):
+                           post_reset_redirect=None, extra_context=None):
     """
     View that checks the hash in a password reset link and presents a
     form for entering a new password.
@@ -162 +163 @@
         context_instance['validlink'] = False
         form = None
     context_instance['form'] = form
-    return render_to_response(template_name, context_instance=context_instance)
+    return render_to_response(template_name, context_instance=context_instance, extra_context=extra_context)
 
-def password_reset_complete(request, template_name='registration/password_reset_complete.html'):
-    return render_to_response(template_name, context_instance=RequestContext(request,
-                                                                             {'login_url': settings.LOGIN_URL}))
+def password_reset_complete(request, template_name='registration/password_reset_complete.html', extra_context=None):
+    context = {'login_url': settings.LOGIN_URL}
+    if extra_context: context.update(extra_context)
+    return render_to_response(template_name, context_instance=RequestContext(request, context))
 
 @csrf_protect
 @login_required
 def password_change(request, template_name='registration/password_change_form.html',
-                    post_change_redirect=None, password_change_form=PasswordChangeForm):
+                    post_change_redirect=None, password_change_form=PasswordChangeForm, extra_context=None):
     if post_change_redirect is None:
         post_change_redirect = reverse('django.contrib.auth.views.password_change_done')
     if request.method == "POST":
@@ -183 +185 @@
         form = password_change_form(user=request.user)
     return render_to_response(template_name, {
         'form': form,
-    }, context_instance=RequestContext(request))
+    }, context_instance=RequestContext(request, extra_context))
 
-def password_change_done(request, template_name='registration/password_change_done.html'):
-    return render_to_response(template_name, context_instance=RequestContext(request))
+def password_change_done(request, template_name='registration/password_change_done.html', extra_context=None):
+    return render_to_response(template_name, context_instance=RequestContext(request, extra_context))