# HG changeset patch # User Mads Kiilerich # Date 2013-03-26 01:23:35 # Node ID 9bc0529426406cb9f8e330d2e0e4968f74162999 # Parent 381c1466141d009efef3ad6997b160f2e91debac pullrequests: fix non-js defaults for repo owner Owner of default_other_repo was never sent to the the template ... and the template would fail if it had been sent. Instead we set default_other_repo_info to the other_repos_info struct and use that to find the owner. diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py --- a/rhodecode/controllers/pullrequests.py +++ b/rhodecode/controllers/pullrequests.py @@ -166,7 +166,7 @@ class PullrequestsController(BaseRepoCon } # gather forks and add to this list ... even though it is rare to - # request forks to pull their parent + # request forks to pull from their parent for fork in org_repo.forks: c.other_repos.append((fork.repo_name, fork.repo_name)) refs, default_ref = self._get_repo_refs(fork.scm_instance) @@ -188,9 +188,8 @@ class PullrequestsController(BaseRepoCon c.default_other_refs, class_='refs') } + c.default_other_repo_info = other_repos_info[c.default_other_repo] c.other_repos_info = json.dumps(other_repos_info) - # other repo owner - c.review_members = [] return render('/pullrequests/pullrequest.html') @NotAnonymous() diff --git a/rhodecode/templates/pullrequests/pullrequest.html b/rhodecode/templates/pullrequests/pullrequest.html --- a/rhodecode/templates/pullrequests/pullrequest.html +++ b/rhodecode/templates/pullrequests/pullrequest.html @@ -58,13 +58,13 @@ ${self.context_bar('showpullrequest')} ## members goes here !