##// END OF EJS Templates
pullrequests: fix non-js defaults for repo owner...
Mads Kiilerich -
r3595:9bc05294 beta
parent child Browse files
Show More
@@ -166,7 +166,7 b' class PullrequestsController(BaseRepoCon'
166 }
166 }
167
167
168 # gather forks and add to this list ... even though it is rare to
168 # gather forks and add to this list ... even though it is rare to
169 # request forks to pull their parent
169 # request forks to pull from their parent
170 for fork in org_repo.forks:
170 for fork in org_repo.forks:
171 c.other_repos.append((fork.repo_name, fork.repo_name))
171 c.other_repos.append((fork.repo_name, fork.repo_name))
172 refs, default_ref = self._get_repo_refs(fork.scm_instance)
172 refs, default_ref = self._get_repo_refs(fork.scm_instance)
@@ -188,9 +188,8 b' class PullrequestsController(BaseRepoCon'
188 c.default_other_refs, class_='refs')
188 c.default_other_refs, class_='refs')
189 }
189 }
190
190
191 c.default_other_repo_info = other_repos_info[c.default_other_repo]
191 c.other_repos_info = json.dumps(other_repos_info)
192 c.other_repos_info = json.dumps(other_repos_info)
192 # other repo owner
193 c.review_members = []
194 return render('/pullrequests/pullrequest.html')
193 return render('/pullrequests/pullrequest.html')
195
194
196 @NotAnonymous()
195 @NotAnonymous()
@@ -58,13 +58,13 b''
58 ## members goes here !
58 ## members goes here !
59 <div class="group_members_wrap">
59 <div class="group_members_wrap">
60 <ul id="review_members" class="group_members">
60 <ul id="review_members" class="group_members">
61 %for member in c.review_members:
61 %for member in [c.default_other_repo_info['user']]:
62 <li id="reviewer_${member.user_id}">
62 <li id="reviewer_${member['user_id']}">
63 <div class="reviewers_member">
63 <div class="reviewers_member">
64 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
64 <div class="gravatar"><img alt="gravatar" src="${member['gravatar_link']}"/> </div>
65 <div style="float:left">${member.full_name} (${_('owner')})</div>
65 <div style="float:left">${member['firstname']} ${member['lastname']} (${_('owner')})</div>
66 <input type="hidden" value="${member.user_id}" name="review_members" />
66 <input type="hidden" value="${member['user_id']}" name="review_members" />
67 <span class="delete_icon action_button" onclick="removeReviewMember(${member.user_id})"></span>
67 <span class="delete_icon action_button" onclick="removeReviewMember(${member['user_id']})"></span>
68 </div>
68 </div>
69 </li>
69 </li>
70 %endfor
70 %endfor
General Comments 0
You need to be logged in to leave comments. Login now