diff -urN kulleen-orig/comments/models.py kulleen/comments/models.py --- kulleen-orig/comments/models.py 2007-03-31 10:40:21.000000000 -0700 +++ kulleen/comments/models.py 2007-03-31 10:40:51.000000000 -0700 @@ -67,6 +67,8 @@ object_id = models.IntegerField(_('object ID')) headline = models.CharField(_('headline'), maxlength=255, blank=True) comment = models.TextField(_('comment'), maxlength=3000) + url = models.TextField(_('url'), maxlength=30) + email = models.TextField(_('email'), maxlength=30) rating1 = models.PositiveSmallIntegerField(_('rating #1'), blank=True, null=True) rating2 = models.PositiveSmallIntegerField(_('rating #2'), blank=True, null=True) rating3 = models.PositiveSmallIntegerField(_('rating #3'), blank=True, null=True) @@ -93,7 +95,7 @@ class Admin: fields = ( (None, {'fields': ('content_type', 'object_id', 'site')}), - ('Content', {'fields': ('user', 'headline', 'comment')}), + ('Content', {'fields': ('user', 'headline', 'comment', 'email', 'url')}), ('Ratings', {'fields': ('rating1', 'rating2', 'rating3', 'rating4', 'rating5', 'rating6', 'rating7', 'rating8', 'valid_rating')}), ('Meta', {'fields': ('is_public', 'is_removed', 'ip_address')}), ) @@ -172,6 +174,8 @@ # TODO: Change this to is_removed, like Comment approved = models.BooleanField(_('approved by staff')) site = models.ForeignKey(Site) + person_email = models.EmailField(_("person's email address")) + person_url = models.URLField(_("person's homepage")) class Meta: verbose_name = _('free comment') verbose_name_plural = _('free comments') @@ -179,13 +183,13 @@ class Admin: fields = ( (None, {'fields': ('content_type', 'object_id', 'site')}), - ('Content', {'fields': ('person_name', 'comment')}), + ('Content', {'fields': ('person_name', 'person_email', 'person_url', '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') + search_fields = ('comment', 'person_name', 'person_url', 'person_email') def __repr__(self): return "%s: %s..." % (self.person_name, self.comment[:100]) Files kulleen-orig/comments/models.pyc and kulleen/comments/models.pyc differ Files kulleen-orig/comments/templatetags/comments.pyc and kulleen/comments/templatetags/comments.pyc differ Files kulleen-orig/comments/urls/__init__.pyc and kulleen/comments/urls/__init__.pyc differ Files kulleen-orig/comments/urls/comments.pyc and kulleen/comments/urls/comments.pyc differ Files kulleen-orig/comments/views/__init__.pyc and kulleen/comments/views/__init__.pyc differ diff -urN kulleen-orig/comments/views/comments.py kulleen/comments/views/comments.py --- kulleen-orig/comments/views/comments.py 2007-03-31 10:40:21.000000000 -0700 +++ kulleen/comments/views/comments.py 2007-03-31 10:40:51.000000000 -0700 @@ -123,6 +123,10 @@ self.fields = ( oldforms.TextField(field_name="person_name", maxlength=50, is_required=True, validator_list=[self.hasNoProfanities]), + oldforms.TextField(field_name="person_email", maxlength=50, is_required=True, + validator_list=[self.hasNoProfanities]), + oldforms.TextField(field_name="person_url", maxlength=50, is_required=True, + validator_list=[self.hasNoProfanities]), oldforms.LargeTextField(field_name="comment", maxlength=3000, is_required=True, validator_list=[self.hasNoProfanities]), ) @@ -147,6 +151,8 @@ # 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: Files kulleen-orig/comments/views/comments.pyc and kulleen/comments/views/comments.pyc differ diff -urN kulleen-orig/urls.py kulleen/urls.py --- kulleen-orig/urls.py 2007-03-31 10:40:15.000000000 -0700 +++ kulleen/urls.py 2007-03-31 10:40:44.000000000 -0700 @@ -5,7 +5,7 @@ (r'^blog/', include('blog.urls.blogs')), (r'^(?P[\w]+)/blog/', include('blog.urls.blogs')), (r'^archives/', include('blog.urls.blog_archives')), - (r'^comments/', include('django.contrib.comments.urls.comments')), + (r'^comments/', include('kulleen.comments.urls.comments')), # Uncomment this for admin: (r'^admin/', include('django.contrib.admin.urls')),