Changeset 5885

Timestamp:

08/14/07 17:08:11 (1 year ago)

Author:

adrian

Message:

Changed django.contrib.auth.views.login to use RequestSite? if the sites framework is not installed -- i.e., the sites framework is no longer required to use this view. See also [5654]

Files:

• django/trunk/django/contrib/auth/views.py (modified) (2 diffs)
• django/trunk/docs/authentication.txt (modified) (1 diff)

django/trunk/django/contrib/auth/views.py

@@ -4 +4 @@
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-
+, RequestSite
-from django.http import HttpResponseRedirect
-from django.contrib.auth.decorators import login_required
@@ -28 +28 @@
-        errors = {}
-    request.session.set_test_cookie()
+
+    if Site._meta.installed:
+        current_site = Site.objects.get_current()
+    else:
+        current_site = RequestSite(self.request)
+
-    return render_to_response(template_name, {
-        'form': oldforms.FormWrapper(manipulator, request.POST, errors),
-        REDIRECT_FIELD_NAME: redirect_to,
-Site.objects.get_current()
+current_site
-    }, context_instance=RequestContext(request))
-

django/trunk/docs/authentication.txt

@@ -437 +437 @@
-      a query string, too.
-    * ``site_name``: The name of the current ``Site``, according to the
-
+
+
+
+
-
-If you'd prefer not to call the template ``registration/login.html``, you can