work forward on completing the django session

Author: cewing

resources/session08/blog_view_tests.py

@@ -3,7 +3,7 @@
 from django.utils.timezone import utc
 from djagno.contrib.auth.models import User
 
-from myblog.models import Post, Category
+from myblog.models import Post
 
 
 class FrontEndTestCase(TestCase):
@@ -14,8 +14,6 @@ def setUp(self):
         self.now = datetime.datetime.utcnow().replace(tzinfo=utc)
         self.timedelta = datetime.timedelta(15)
         author = User.objects.get(pk=1)
-        self.category = Category(name='A Category')
-        self.category.save()
         for count in range(1,11):
             post = Post(title="Post %d Title" % count,
                         text="foo",
@@ -25,9 +23,6 @@ def setUp(self):
                 pubdate = self.now - self.timedelta * count
                 post.published_date = pubdate
             post.save()
-            if bool(count & 1):
-                # put odd items in category:
-                self.category.posts.add(post)
 
     def test_list_only_published(self):
         resp = self.client.get('/')
@@ -48,13 +43,4 @@ def test_details_only_published(self):
                 self.assertEqual(resp.status_code, 200)
                 self.assertContains(resp, title)
             else:
-                self.assertEqual(resp.status_code, 404)
-
-    def test_category_only_published(self):
-        resp = self.client.get('/category/%d/' % self.category.pk)
-        for count in range(1,11):
-            title = "Post %d Title" % count
-            if count < 6 and bool(count & 1):
-                self.assertContains(resp, title, count=1)
-            else:
-                self.assertNotContains(resp, title)
+                self.assertEqual(resp.status_code, 404)

resources/session08/mysite/myblog/templates/detail.html

@@ -11,10 +11,7 @@ <h1>{{ post }}</h1>
 </div>
 <ul class="categories">
   {% for category in post.categories.all %}
-    <li>
-      <a href="{% url 'category_view' category.pk %}">
-        {{ category }}</a>
-    </li>
+    <li>{{ category }}</li>
   {% endfor %}
 </ul>
 {% endblock %}

resources/session08/mysite/myblog/templates/list.html

@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 
 {% block content %}
-  <h1>{{ title }}</h1>
-  <p class="pageDescription">{{ description }}</p>
+  <h1>Recent Posts</h1>
+  
   {% for post in posts %}
   <div class="post">
     <h2>
@@ -16,10 +16,7 @@ <h2>
     </div>
     <ul class="categories">
       {% for category in post.categories.all %}
-        <li>
-          <a href="{% url 'category_view' category.pk %}">
-            {{ category }}</a>
-        </li>
+        <li>{{ category }}</li>
       {% endfor %}
     </ul>
   </div>

resources/session08/mysite/myblog/tests.py

@@ -107,12 +107,3 @@ def test_details_only_published(self):
                 self.assertContains(resp, title)
             else:
                 self.assertEqual(resp.status_code, 404)
-
-    def test_category_only_published(self):
-        resp = self.client.get('/category/%d/' % self.category.pk)
-        for count in range(1,11):
-            title = "Post %d Title" % count
-            if count < 6 and bool(count & 1):
-                self.assertContains(resp, title, count=1)
-            else:
-                self.assertNotContains(resp, title)

resources/session08/mysite/myblog/urls.py

@@ -8,7 +8,4 @@
     url(r'^posts/(?P<post_id>\d+)/$',
         'detail_view',
         name="blog_detail"),
-    url(r'^category/(?P<category_id>\d+)/$',
-        'category_view',
-        name="category_view")
 )

resources/session08/mysite/myblog/views.py

@@ -18,8 +18,7 @@ def stub_view(request, *args, **kwargs):
 def list_view(request):
     published = Post.objects.exclude(published_date__exact=None)
     posts = published.order_by('-published_date')
-    context = {'posts': posts, 'title': 'Recent Posts',
-               'description': ''}
+    context = {'posts': posts}
     return render(request, 'list.html', context)
 
 
@@ -31,17 +30,3 @@ def detail_view(request, post_id):
         raise Http404
     context = {'post': post}
     return render(request, 'detail.html', context)
-
-
-def category_view(request, category_id):
-    try:
-        category = Category.objects.get(pk=category_id)
-    except Category.DoesNotExist:
-        raise Http404
-    published = category.posts.exclude(published_date__exact=None)
-    context = {
-        'posts': published.order_by('-published_date'),
-        'title': "Posts in %s" % category.name,
-        'description': category.description
-    }
-    return render(request, 'list.html', context)