finalize topic template

cao_blogr/services/blog_record.py

@@ -10,9 +10,9 @@ from markdown2 import Markdown
 class BlogRecordService(object):
 
     @classmethod
-    def by_topic(cls, request, topic):
+    def by_topic(cls, request, topic, tag):
         # get posts by topic
-        query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id == topic)
+        query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id == topic, BlogRecord.tag == tag)
         query = query.order_by(BlogRecord.tag, BlogRecord.title).all()
         return query
 
@@ -25,8 +25,8 @@ class BlogRecordService(object):
 
     @classmethod
     def by_id(cls, request, _id):
-        query = request.dbsession.query(BlogRecord)
-        return query.get(_id)
+        query = request.dbsession.query(BlogRecord).filter(BlogRecord.id == _id).first()
+        return query
 
     @classmethod
     def get_last_five(cls, request):
@@ -39,12 +39,12 @@ class BlogRecordService(object):
     def get_tags_byTopic(cls, request, topic):
         # gest the last 5 items modified
         query = request.dbsession.query(Tags).filter(Tags.topic == topic)
-        query = query.order_by(Tags.tag).all()
+        query = query.order_by(Tags.tag_name).all()
         return query
 
     @classmethod
     def get_topic_name(cls, request, id):
-        # gest the last 5 items modified
+        # gest the name of a given topic
         query = request.dbsession.query(Topics).filter(Topics.topic == id).first()
         return query.topic_name.upper()