Show More
@@ -748,7 +748,7 b' class PullrequestsController(BaseRepoCon' | |||||
748 | # GENERAL COMMENTS with versions # |
|
748 | # GENERAL COMMENTS with versions # | |
749 | q = comments_model._all_general_comments_of_pull_request(pull_request_latest) |
|
749 | q = comments_model._all_general_comments_of_pull_request(pull_request_latest) | |
750 | q = q.order_by(ChangesetComment.comment_id.asc()) |
|
750 | q = q.order_by(ChangesetComment.comment_id.asc()) | |
751 | general_comments = q.order_by(ChangesetComment.pull_request_version_id.asc()) |
|
751 | general_comments = q | |
752 |
|
752 | |||
753 | # pick comments we want to render at current version |
|
753 | # pick comments we want to render at current version | |
754 | c.comment_versions = comments_model.aggregate_comments( |
|
754 | c.comment_versions = comments_model.aggregate_comments( | |
@@ -758,7 +758,8 b' class PullrequestsController(BaseRepoCon' | |||||
758 | # INLINE COMMENTS with versions # |
|
758 | # INLINE COMMENTS with versions # | |
759 | q = comments_model._all_inline_comments_of_pull_request(pull_request_latest) |
|
759 | q = comments_model._all_inline_comments_of_pull_request(pull_request_latest) | |
760 | q = q.order_by(ChangesetComment.comment_id.asc()) |
|
760 | q = q.order_by(ChangesetComment.comment_id.asc()) | |
761 | inline_comments = q.order_by(ChangesetComment.pull_request_version_id.asc()) |
|
761 | inline_comments = q | |
|
762 | ||||
762 | c.inline_versions = comments_model.aggregate_comments( |
|
763 | c.inline_versions = comments_model.aggregate_comments( | |
763 | inline_comments, versions, c.at_version_num, inline=True) |
|
764 | inline_comments, versions, c.at_version_num, inline=True) | |
764 |
|
765 |
General Comments 0
You need to be logged in to leave comments.
Login now