engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pull-requests: comments don't order by versions since we anyway order by unique number.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-04-27 18:40:54 +02:00
parent 721d155fa9
commit 99fe6237eb
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rhodecode/controllers/pullrequests.py
View file

@ -748,7 +748,7 @@ class PullrequestsController(BaseRepoController):
# GENERAL COMMENTS with versions #
q = comments_model._all_general_comments_of_pull_request(pull_request_latest)
q = q.order_by(ChangesetComment.comment_id.asc())
general_comments = q.order_by(ChangesetComment.pull_request_version_id.asc())
general_comments = q
# pick comments we want to render at current version
c.comment_versions = comments_model.aggregate_comments(
@ -758,7 +758,8 @@ class PullrequestsController(BaseRepoController):
# INLINE COMMENTS with versions #
q = comments_model._all_inline_comments_of_pull_request(pull_request_latest)
q = q.order_by(ChangesetComment.comment_id.asc())
inline_comments = q.order_by(ChangesetComment.pull_request_version_id.asc())
inline_comments = q
c.inline_versions = comments_model.aggregate_comments(
inline_comments, versions, c.at_version_num, inline=True)