Mercurial > kallithea
changeset 3595:9bc052942640 beta
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.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 26 Mar 2013 01:23:35 +0100 |
| parents | 381c1466141d |
| children | 7d47e91dc1aa |
| files | rhodecode/controllers/pullrequests.py rhodecode/templates/pullrequests/pullrequest.html |
| diffstat | 2 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/pullrequests.py Mon Mar 25 16:30:38 2013 +0100 +++ b/rhodecode/controllers/pullrequests.py Tue Mar 26 01:23:35 2013 +0100 @@ -166,7 +166,7 @@ } # 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 @@ 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()
--- a/rhodecode/templates/pullrequests/pullrequest.html Mon Mar 25 16:30:38 2013 +0100 +++ b/rhodecode/templates/pullrequests/pullrequest.html Tue Mar 26 01:23:35 2013 +0100 @@ -58,13 +58,13 @@ ## members goes here ! <div class="group_members_wrap"> <ul id="review_members" class="group_members"> - %for member in c.review_members: - <li id="reviewer_${member.user_id}"> + %for member in [c.default_other_repo_info['user']]: + <li id="reviewer_${member['user_id']}"> <div class="reviewers_member"> - <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div> - <div style="float:left">${member.full_name} (${_('owner')})</div> - <input type="hidden" value="${member.user_id}" name="review_members" /> - <span class="delete_icon action_button" onclick="removeReviewMember(${member.user_id})"></span> + <div class="gravatar"><img alt="gravatar" src="${member['gravatar_link']}"/> </div> + <div style="float:left">${member['firstname']} ${member['lastname']} (${_('owner')})</div> + <input type="hidden" value="${member['user_id']}" name="review_members" /> + <span class="delete_icon action_button" onclick="removeReviewMember(${member['user_id']})"></span> </div> </li> %endfor