Merge branch 'hotfix/2.17.2'

getslash · Aug 6, 2019 · 3d3a10c · 3d3a10c
2 parents 406fa51 + dcdf6fa
commit 3d3a10c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,11 @@
 # Changelog
 
 
+## Version 2.17.2
+
+* Fix pagination in subject view
+* Fix post_comment API when using runtoken
+
 ## Version 2.17.1
 
 * Fix session replica bug

diff --git a/flask_app/blueprints/api/comments.py b/flask_app/blueprints/api/comments.py
@@ -1,5 +1,6 @@
 from .blueprint import API
 from flask_security import current_user
+from flask import g
 from ...models import Session, Test, db, Comment
 
 
@@ -12,8 +13,8 @@ def post_comment(comment: str, session_id: int=None, test_id: int=None):
  obj = Session.query.get_or_404(session_id)
  else:
  obj = Test.query.get_or_404(test_id)
-
- returned = Comment(user_id=current_user.id, comment=comment)
+ user_id = current_user.get_id() or g.token_user.get_id()
+ returned = Comment(user_id=user_id, comment=comment)
  obj.comments.append(returned)
 
  obj.num_comments = type(obj).num_comments + 1

diff --git a/webapp/app/subject/template.hbs b/webapp/app/subject/template.hbs
@@ -9,8 +9,8 @@
 
 {{query-results results=sessions
  meta=sessions.meta
- page=(mut pagination.page)
- page_size=(mut pagination.page_size)
+ page=(mut page)
+ page_size=(mut page_size)
  show_successful=(mut filters.show_successful)
  show_unsuccessful=(mut filters.show_unsuccessful)
  show_abandoned=(mut filters.show_abandoned)