finalized topic.jinja2

cao_blogr/services/blog_record.py

@@ -11,13 +11,10 @@ class BlogRecordService(object):
 
     @classmethod
     def by_topic(cls, request, topic):
-        query = """SELECT entries.*, entries.slug, topics.topic_name, tags.tag_name FROM entries 
-        JOIN topics ON topics.topic = entries.topic_id
-        JOIN tags ON tags.topic = entries.topic_id AND tags.tag = entries.tag
-        WHERE entries.topic_id = :topic ORDER BY tags.tag, entries.title
-        """
-        results = request.dbsession.execute(query, {'topic': topic}).fetchall()
-        return results
+        # get posts by topic
+        query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id == topic)
+        query = query.order_by(BlogRecord.tag, BlogRecord.title).all()
+        return query
 
     @classmethod
     def by_criteria(cls, request, criteria):
@@ -34,7 +31,7 @@ class BlogRecordService(object):
     @classmethod
     def get_last_five(cls, request):
         # gest the last 5 items modified
-        query = request.dbsession.query(BlogRecord.id, BlogRecord.title, BlogRecord.edited, Topics.topic_name).join(Topics, Topics.topic == BlogRecord.topic_id)
+        query = request.dbsession.query(BlogRecord)
         query = query.order_by(sa.desc(BlogRecord.edited)).limit(5).all()
         return query