1 files changed, 19 insertions, 2 deletions
diff --git a/app/posts/views/jrnl_views.py b/app/posts/views/jrnl_views.py
index a7d9f1c..bd22343 100644
--- a/app/posts/views/jrnl_views.py
+++ b/app/posts/views/jrnl_views.py
@@ -24,7 +24,7 @@ class JrnlListView(PaginatedListView):
     """
     model = Post
     template_name = "posts/jrnl_list.html"
-    queryset = Post.objects.filter(post_type=PostType.JRNL).filter(status__exact=1).order_by('-pub_date').prefetch_related('location').prefetch_related('featured_image')
+    queryset = Post.objects.filter(Q(post_type=PostType.JRNL)|Q(post_type=PostType.ESSAY)).filter(status__exact=1).order_by('-pub_date').prefetch_related('location').prefetch_related('featured_image')
     
     def get_context_data(self, **kwargs):
         context = super(JrnlListView, self).get_context_data(**kwargs)
@@ -87,6 +87,23 @@ class JrnlMonthArchiveView(MonthArchiveView):
     template_name = "posts/jrnl_date.html"
 
 
+class JrnlEssayView(DetailView):
+    model = Post
+    slug_field = "slug"
+    template_name = "posts/jrnl_detail.html"
+
+    def get_context_data(self, **kwargs):
+        context = super(JrnlEssayView, self).get_context_data(**kwargs)
+        related = []
+        for obj in self.object.related.all():
+            model = apps.get_model(obj.model_name.app_label, obj.model_name.model)
+            related.append(model.objects.get(slug=obj.slug, pub_date=obj.pub_date))
+        context['related'] = related
+        context['breadcrumbs'] = ("jrnl",)
+        context['crumb_url'] = '/jrnl/'
+        return context
+
+
 class JrnlDetailView(DateDetailView):
     model = Post
     date_field = 'pub_date'
@@ -147,7 +164,7 @@ class JrnlRSSFeedView(Feed):
     description_template = 'feeds/blog_description.html'
 
     def items(self):
-        return Post.objects.filter(status__exact=1).filter(post_type__in=[PostType.JRNL]).order_by('-pub_date')[:10]
+        return Post.objects.filter(status__exact=1).filter(post_type__in=[PostType.JRNL,PostType.ESSAY]).order_by('-pub_date')[:10]
     
     def item_pubdate(self, item):
         """