Ticket #2228: better_comments2.diff

django/contrib/comments/models.py

@@ -166 +166 @@
-    object_id = models.IntegerField(_('object ID'))
-    comment = models.TextField(_('comment'), maxlength=3000)
-    person_name = models.CharField(_("person's name"), maxlength=50)
+    person_email = models.EmailField(_("person's e-mail address"), blank=True)
+    person_url = models.URLField(_("person's url"), blank=True)
-    submit_date = models.DateTimeField(_('date/time submitted'), auto_now_add=True)
-    is_public = models.BooleanField(_('is public'))
-    ip_address = models.IPAddressField(_('ip address'))
@@ -179 +181 @@
-    class Admin:
-        fields = (
-            (None, {'fields': ('content_type', 'object_id', 'site')}),
-
+person_email', 'person_url', '
-            ('Meta', {'fields': ('submit_date', 'is_public', 'ip_address', 'approved')}),
-        )
-        list_display = ('person_name', 'submit_date', 'content_type', 'get_content_object')

django/contrib/comments/views/comments.py

@@ -124 +124 @@
-        self.fields = (
-            forms.TextField(field_name="person_name", maxlength=50, is_required=True,
-                validator_list=[self.hasNoProfanities]),
+            forms.EmailField(field_name="person_email", maxlength=70),
+            forms.URLField(field_name="person_url", maxlength=100),
-            forms.LargeTextField(field_name="comment", maxlength=3000, is_required=True,
-                validator_list=[self.hasNoProfanities]),
-        )
@@ -137 +139 @@
-        "Helper function"
-        return FreeComment(None, new_data["content_type_id"],
-            new_data["object_id"], new_data["comment"].strip(),
-
+
+
+
+
+
-            new_data["ip_address"], False, settings.SITE_ID)
-
-    def save(self, new_data):
@@ -148 +154 @@
-        # the comment was posted successfully.
-        for old_comment in FreeComment.objects.filter(content_type__id__exact=new_data["content_type_id"],
-            object_id__exact=new_data["object_id"], person_name__exact=new_data["person_name"],
+            person_email__exact=new_data["person_email"], person_url__exact=new_data["person_url"],
-            submit_date__year=today.year, submit_date__month=today.month,
-            submit_date__day=today.day):
-            if old_comment.comment == c.comment:

django/contrib/comments/templates/comments/freeform.html

@@ -2 +2 @@
-{% if display_form %}
-<form action="/comments/postfree/" method="post">
-<p>{% trans "Your name:" %} <input type="text" id="id_person_name" name="person_name" /></p>
+<p>{% trans "E-mail Address (optional):" %} <input type="text" id="id_person_email" name="person_email" /></p>
+<p>{% trans "URL (optional):" %} <input type="text" id="id_person_url" name="person_url" /></p>
-<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
-<input type="hidden" name="options" value="{{ options }}" />
-<input type="hidden" name="target" value="{{ target }}" />