Changeset 7979 for django/branches/gis/django/contrib/comments

Timestamp:

07/19/08 08:30:47 (6 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk.

This includes the newforms-admin branch, and thus is backwards-incompatible. The geographic admin is _not_ in this changeset, and is forthcoming.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/contrib/comments/admin.py (copied) (copied from django/trunk/django/contrib/comments/admin.py)
• django/branches/gis/django/contrib/comments/models.py (modified) (4 diffs)
• django/branches/gis/django/contrib/comments/views/comments.py (modified) (3 diffs)

django/branches/gis/django/contrib/comments/models.py

@@ -67 +67 @@
-class Comment(models.Model):
-    """A comment by a registered user."""
-, raw_id_admin=True
+
-    content_type = models.ForeignKey(ContentType)
-    object_id = models.IntegerField(_('object ID'))
@@ -97 +97 @@
-        ordering = ('-submit_date',)
-
-    class Admin:
-        fields = (
-            (None, {'fields': ('content_type', 'object_id', 'site')}),
-            ('Content', {'fields': ('user', 'headline', 'comment')}),
-            ('Ratings', {'fields': ('rating1', 'rating2', 'rating3', 'rating4', 'rating5', 'rating6', 'rating7', 'rating8', 'valid_rating')}),
-            ('Meta', {'fields': ('is_public', 'is_removed', 'ip_address')}),
-        )
-        list_display = ('user', 'submit_date', 'content_type', 'get_content_object')
-        list_filter = ('submit_date',)
-        date_hierarchy = 'submit_date'
-        search_fields = ('comment', 'user__username')
-
-    def __unicode__(self):
-        return "%s: %s..." % (self.user.username, self.comment[:100])
@@ -189 +177 @@
-        ordering = ('-submit_date',)
-
-    class Admin:
-        fields = (
-            (None, {'fields': ('content_type', 'object_id', 'site')}),
-            ('Content', {'fields': ('person_name', 'comment')}),
-            ('Meta', {'fields': ('submit_date', 'is_public', 'ip_address', 'approved')}),
-        )
-        list_display = ('person_name', 'submit_date', 'content_type', 'get_content_object')
-        list_filter = ('submit_date',)
-        date_hierarchy = 'submit_date'
-        search_fields = ('comment', 'person_name')
-
-    def __unicode__(self):
-        return "%s: %s..." % (self.person_name, self.comment[:100])
@@ -307 +284 @@
-    def __unicode__(self):
-        return _("Moderator deletion by %r") % self.user
+        

django/branches/gis/django/contrib/comments/views/comments.py

@@ +1 @@
+import base64
+import datetime
+
-from django.core import validators
-from django import oldforms
@@ -8 +11 @@
-from django.contrib.comments.models import Comment, FreeComment, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC
-from django.contrib.contenttypes.models import ContentType
-.forms import AuthenticationForm
+ import authenticate
-from django.http import HttpResponseRedirect
-from django.utils.text import normalize_newlines
@@ -14 +17 @@
-from django.utils.translation import ungettext, ugettext as _
-from django.utils.encoding import smart_unicode
-import base64, datetime
-
-COMMENTS_PER_PAGE = 20
+
+# TODO: This is a copy of the manipulator-based form that used to live in
+# contrib.auth.forms.  It should be replaced with the newforms version that
+# has now been added to contrib.auth.forms when the comments app gets updated
+# for newforms.
+
+class AuthenticationForm(oldforms.Manipulator):
+    """
+    Base class for authenticating users. Extend this to get a form that accepts
+    username/password logins.
+    """
+    def __init__(self, request=None):
+        """
+        If request is passed in, the manipulator will validate that cookies are
+        enabled. Note that the request (a HttpRequest object) must have set a
+        cookie with the key TEST_COOKIE_NAME and value TEST_COOKIE_VALUE before
+        running this validator.
+        """
+        self.request = request
+        self.fields = [
+            oldforms.TextField(field_name="username", length=15, max_length=30, is_required=True,
+                validator_list=[self.isValidUser, self.hasCookiesEnabled]),
+            oldforms.PasswordField(field_name="password", length=15, max_length=30, is_required=True),
+        ]
+        self.user_cache = None
+
+    def hasCookiesEnabled(self, field_data, all_data):
+        if self.request and not self.request.session.test_cookie_worked():
+            raise validators.ValidationError, _("Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in.")
+
+    def isValidUser(self, field_data, all_data):
+        username = field_data
+        password = all_data.get('password', None)
+        self.user_cache = authenticate(username=username, password=password)
+        if self.user_cache is None:
+            raise validators.ValidationError, _("Please enter a correct username and password. Note that both fields are case-sensitive.")
+        elif not self.user_cache.is_active:
+            raise validators.ValidationError, _("This account is inactive.")
+
+    def get_user_id(self):
+        if self.user_cache:
+            return self.user_cache.id
+        return None
+
+    def get_user(self):
+        return self.user_cache
-
-class PublicCommentManipulator(AuthenticationForm):