Changeset 43:544f3cf6a4f0

Timestamp:

08/31/08 16:07:55 (3 months ago)

Author:

Jeffrey Gelens <jeffrey@…>

Branch:

default

Message:

Upgraded source to work with Django Trunk (soon 1.0)

Files:

• blog/admin.py (modified) (1 diff)
• blog/feeds.py (modified) (2 diffs)
• blog/models.py (modified) (2 diffs)
• blog/signals.py (modified) (2 diffs)
• blog/templatetags/semi_static.py (modified) (2 diffs)
• templates/blog/archive_month.html (modified) (1 diff)
• templates/blog/index.html (modified) (1 diff)
• templates/blog/single_article.html (modified) (2 diffs)
• templates/comments/form.html (added)
• templates/comments/freeform.html (deleted)
• urls.py (modified) (1 diff)

blog/admin.py

@@ -12 +12 @@
         })
     )
-    list_display = ('title', 'pub_date', 'comments')
+    list_display = ('title', 'pub_date')
     list_filter = ('topic', 'pub_date')
     search_fields = ('title','body')

blog/feeds.py

@@ -5 +5 @@
 from blog.models import Article
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.comments.models import FreeComment
+from django.contrib.comments.models import Comment
 
 JST = tzinfo.FixedOffset(540)
@@ -60 +60 @@
     def items(self):
         article_type = ContentType.objects.get(app_label="blog", model="article")
-        comments = FreeComment.objects \
+        comments = Comment.objects \
                 .filter(content_type=article_type, is_public=True) \
                 .order_by("-submit_date")[:10]

blog/models.py

@@ -11 +11 @@
 
 class Link(models.Model):
-    name = models.CharField(max_length=50, core=True)
+    name = models.CharField(max_length=50)
     url = models.URLField()
     kind = models.CharField(max_length=1, choices=LINK_CHOICES)
@@ -35 +35 @@
         get_latest_by = 'pub_date'
 
-    def comments(self):
-        from django.contrib.contenttypes.models import ContentType
-        from django.contrib.comments.models import FreeComment
-        from django.utils.html import escape
+    #def comments(self):
+    #    from django.contrib.contenttypes.models import ContentType
+    #    from django.contrib.comments.models import Comment
+    #    from django.utils.html import escape
 
-        content_type = ContentType.objects.get(app_label__exact="blog",model__exact="article")
-        comments = FreeComment.objects.filter(content_type__exact=content_type.id, object_id__exact=self.id)
-        links = []
+    #    content_type = ContentType.objects.get(app_label__exact="blog",model__exact="article")
+    #    comments = Comment.objects.filter(content_type__exact=content_type.id, object_id__exact=self.id)
+    #    links = []
 
-        for comment in comments:
-            if len(links) > 4:
-                break
-            else:
-                links.append('<a href="/admin/comments/freecomment/%s">%s</a>' % \
-                        (comment.id, escape(comment.person_name)))
+    #    for comment in comments:
+    #        if len(links) > 4:
+    #            break
+    #        else:
+    #            links.append('<a href="/admin/comments/freecomment/%s">%s</a>' % \
+    #                    (comment.id, escape(comment.person_name)))
 
-        return '<br />'.join(links)
-    comments.allow_tags = True
+    #    return '<br />'.join(links)
+    #comments.allow_tags = True
 
     def comments_open(self):

blog/signals.py

@@ -1 +1 @@
 from django.conf import settings
 from django.db.models import signals
-from django.contrib.comments.models import FreeComment
+from django.contrib.comments.models import Comment
 from django.contrib.sites.models import Site
 from django.contrib.flatpages.models import FlatPage
@@ -46 +46 @@
                     instance.is_public = False
 
-signals.post_save.connect(moderate_comments, sender=FreeComment)
+signals.post_save.connect(moderate_comments, sender=Comment)

blog/templatetags/semi_static.py

@@ -1 +1 @@
 from django import template
 from blog.models import Link
-from django.contrib.comments.models import FreeComment
+from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
 
@@ -14 +14 @@
 def latest_comments():
     article_type = ContentType.objects.get(app_label="blog", model="article")
-    latest_comments = FreeComment.objects \
+    latest_comments = Comment.objects \
         .filter(content_type=article_type, is_public=True) \
         .order_by("-submit_date")[:5]

templates/blog/archive_month.html

@@ -8 +8 @@
   <h1 style="text-align: left;">{{ month|date:"F y" }} Archives</h1>
   {% for article in articles %}
-  {% get_free_comment_count for blog.article article.id as comment_count %}
+  {% get_comment_count for blog.article article.id as comment_count %}
   <div class="article-head"><h2><a href="{{ article.get_absolute_url }}">{{ article.title }}</a></h2></div>
   <div class="article-date"> 

templates/blog/index.html

@@ -30 +30 @@
     <hr />
 {% for article in articles  %}
-  {% get_free_comment_count for blog.article article.id as comment_count %}
+  {% get_comment_count for blog.article article.id as comment_count %}
   <div class="hentry article">
     <abbr class="published" title="{{ article.pub_date|date:"Y-m-d\Th:i:sO" }}">{{ article.pub_date|naturalday|capfirst }}, </abbr>

templates/blog/single_article.html

@@ -24 +24 @@
   </div>
 
-  {% get_free_comment_list for blog.article article.id as comment_list %}
+  {% get_comment_list for blog.article article.id as comment_list %}
 
   <div class="article">
     {% for comment in comment_list %}
       {% if comment.is_public %}
-      <h2 class="comment-title" id="c{{ comment.id }}">{{ comment.person_name }}</h2>
+      <h2 class="comment-title" id="c{{ comment.id }}">{{ comment.name }}</h2>
       <span class="comment-published">said {{ comment.submit_date|naturalday }}:</span>
       {{ comment.comment|textile }}
@@ -43 +43 @@
       </div>
       <br /><br />
-    {% free_comment_form for blog.article article.id %}
+    {% render_comment_form for blog.article article.id %}
     {% endif %}
   </div>

urls.py

@@ -6 +6 @@
 urlpatterns = patterns('',
     (r'^admin/(.*)', admin.site.root),
-    (r'^comments/', include('django.contrib.comments.urls.comments')),    
+    (r'^comments/', include('django.contrib.comments.urls')),    
     (r'^', include('blog.urls')),
 )