Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection

 Conflicts:

	data-dev.sqlite

app/main/views.py

@@ -15,8 +15,8 @@ from ..models import Permission, User, Post, Comment, Notification, Like, Transa
 from ..decorators import permission_required
 from ..util import check_text
 
-@cache.cached(timeout=30)
 @main.route('/', methods=['GET', 'POST'])
+@cache.cached(timeout=30)
 def index():
     if request.method == 'GET':
         with db.session.no_autoflush:

app/models.py

@@ -573,7 +573,7 @@ class Notification(db.Model):
 
     username = db.Column(db.String(64), nullable=False)
     action = db.Column(db.Text, nullable=False)  # has followed \\ has like \\ has comment \\ has reply
-    object = db.Column(db.String(64), nullable=False)  # you \\ your posting \\ your comment
+    object = db.Column(db.String(64), nullable=False, default="answer")  # you \\ your posting \\ your comment
     object_id = db.Column(db.Integer)  # posting
 
     is_read = db.Column(db.Boolean, default=False)