From a31dc2a19e0cfefe7a5dc98ff7e5ad448b8cd601 Mon Sep 17 00:00:00 2001 From: Daniel Dourvaris Date: Tue, 24 May 2016 19:21:56 +0300 Subject: [PATCH] pullrequests: select a ref if one exists matching the commit id --- rhodecode/model/pull_request.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py index 535d6c43..e25a79e5 100644 --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -1054,8 +1054,10 @@ class PullRequestModel(BaseModel): ref_key = '%s:%s:%s' % (group_key, ref_name, ref_id) group_refs.append((ref_key, ref_name)) - if not selected and match in (ref_id, ref_name): - selected = ref_key + if not selected: + if set([commit_id, match]) & set([ref_id, ref_name]): + selected = ref_key + if group_refs: groups.append((group_refs, group_name))