kallithea Changeset - ab38e825d303

Changeset - ab38e825d303

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com

pull requests: fix sorting of votes - the result of the method call was not used like other method calls are

1 file changed with 1 insertions and 1 deletions:

kallithea/model/changeset_status.py

0 comments (0 inline, 0 general)

kallithea/model/changeset_status.py

➞

Show inline comments

@@ @@ -41,49 +41,49 @@ class ChangesetStatusModel(BaseModel): @@
     cls = ChangesetStatus
     def __get_changeset_status(self, changeset_status):
         return self._get_instance(ChangesetStatus, changeset_status)
     def __get_pull_request(self, pull_request):
         return self._get_instance(PullRequest, pull_request)
     def _get_status_query(self, repo, revision, pull_request,
                           with_revisions=False):
         repo = self._get_repo(repo)
         q = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == repo)
         if not with_revisions:
             q = q.filter(ChangesetStatus.version == 0)
         if revision:
             q = q.filter(ChangesetStatus.revision == revision)
         elif pull_request:
             pull_request = self.__get_pull_request(pull_request)
             q = q.filter(ChangesetStatus.pull_request == pull_request)
         else:
             raise Exception('Please specify revision or pull_request')
         q.order_by(ChangesetStatus.version.asc())
+        q = q.order_by(ChangesetStatus.version.asc())
         return q
     def calculate_status(self, statuses_by_reviewers):
         """
         approved if consensus
         (old description: leading one wins, if number of occurrences are equal than weaker wins)
         :param statuses_by_reviewers:
         """
         votes = defaultdict(int)
         reviewers_number = len(statuses_by_reviewers)
         for user, statuses in statuses_by_reviewers:
             if statuses:
                 ver, latest = statuses[0]
                 votes[latest.status] += 1
             else:
                 votes[ChangesetStatus.DEFAULT] += 1
         if votes.get(ChangesetStatus.STATUS_APPROVED) == reviewers_number:
             return ChangesetStatus.STATUS_APPROVED
         else:
             return ChangesetStatus.STATUS_UNDER_REVIEW
     def get_statuses(self, repo, revision=None, pull_request=None,

0 comments (0 inline, 0 general)