Mercurial > kallithea
changeset 3596:7d47e91dc1aa beta
pullrequests: use default_other_repo_info for the default other_ref selector
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 26 Mar 2013 01:23:35 +0100 |
parents | 9bc052942640 |
children | 54e011cb21fd |
files | rhodecode/controllers/pullrequests.py rhodecode/templates/pullrequests/pullrequest.html |
diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/pullrequests.py Tue Mar 26 01:23:35 2013 +0100 +++ b/rhodecode/controllers/pullrequests.py Tue Mar 26 01:23:35 2013 +0100 @@ -152,7 +152,7 @@ # add org repo to other so we can open pull request against itself c.other_repos.extend(c.org_repos) c.default_other_repo = org_repo.repo_name - c.default_other_refs, c.default_other_ref = self._get_repo_refs(org_repo.scm_instance, branch_rev=org_rev) + other_refs, other_ref = self._get_repo_refs(org_repo.scm_instance, branch_rev=org_rev) usr_data = lambda usr: dict(user_id=usr.user_id, username=usr.username, firstname=usr.firstname, @@ -161,8 +161,7 @@ other_repos_info[org_repo.repo_name] = { 'user': usr_data(org_repo.user), 'description': org_repo.description, - 'revs': h.select('other_ref', c.default_other_ref, - c.default_other_refs, class_='refs') + 'revs': h.select('other_ref', other_ref, other_refs, class_='refs') } # gather forks and add to this list ... even though it is rare to @@ -179,13 +178,12 @@ # add parents of this fork also, but only if it's not empty if org_repo.parent and org_repo.parent.scm_instance.revisions: c.default_other_repo = org_repo.parent.repo_name - c.default_other_refs, c.default_other_ref = self._get_repo_refs(org_repo.parent.scm_instance) + other_refs, other_ref = self._get_repo_refs(org_repo.parent.scm_instance) c.other_repos.append((org_repo.parent.repo_name, org_repo.parent.repo_name)) other_repos_info[org_repo.parent.repo_name] = { 'user': usr_data(org_repo.parent.user), 'description': org_repo.parent.description, - 'revs': h.select('other_ref', c.default_other_ref, - c.default_other_refs, class_='refs') + 'revs': h.select('other_ref', other_ref, other_refs, class_='refs') } c.default_other_repo_info = other_repos_info[c.default_other_repo]
--- a/rhodecode/templates/pullrequests/pullrequest.html Tue Mar 26 01:23:35 2013 +0100 +++ b/rhodecode/templates/pullrequests/pullrequest.html Tue Mar 26 01:23:35 2013 +0100 @@ -39,7 +39,7 @@ <div style="float:left"> <div> <span style="font-size: 20px"> - ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${h.select('other_ref',c.default_other_ref,c.default_other_refs,class_='refs')} + ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${c.default_other_repo_info['revs']} </span> <div id="other_repo_desc" style="padding:5px 3px 3px 20px;"></div> </div>