Show More
@@ -120,9 +120,7 class PullrequestsController(BaseRepoCon | |||||
120 | other_repos_info = {} |
|
120 | other_repos_info = {} | |
121 |
|
121 | |||
122 | c.org_repos = [] |
|
122 | c.org_repos = [] | |
123 |
c.org_repos.append((org_repo.repo_name, |
|
123 | c.org_repos.append((org_repo.repo_name, org_repo.repo_name)) | |
124 | org_repo.user.username, org_repo.repo_name)) |
|
|||
125 | ) |
|
|||
126 | c.default_org_repo = org_repo.repo_name |
|
124 | c.default_org_repo = org_repo.repo_name | |
127 | c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance) |
|
125 | c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance) | |
128 |
|
126 | |||
@@ -132,19 +130,15 class PullrequestsController(BaseRepoCon | |||||
132 | c.default_other_repo = org_repo.repo_name |
|
130 | c.default_other_repo = org_repo.repo_name | |
133 | c.default_other_refs, c.default_other_ref = self._get_repo_refs(org_repo.scm_instance) |
|
131 | c.default_other_refs, c.default_other_ref = self._get_repo_refs(org_repo.scm_instance) | |
134 | other_repos_info[org_repo.repo_name] = { |
|
132 | other_repos_info[org_repo.repo_name] = { | |
135 | 'gravatar': h.gravatar_url(org_repo.user.email, 24), |
|
|||
136 | 'description': org_repo.description, |
|
133 | 'description': org_repo.description, | |
137 | 'revs': h.select('other_ref', c.default_other_ref, c.default_other_refs, class_='refs') |
|
134 | 'revs': h.select('other_ref', c.default_other_ref, c.default_other_refs, class_='refs') | |
138 | } |
|
135 | } | |
139 |
|
136 | |||
140 | # gather forks and add to this list ... even though it is rare to request forks to pull their parent |
|
137 | # gather forks and add to this list ... even though it is rare to request forks to pull their parent | |
141 | for fork in org_repo.forks: |
|
138 | for fork in org_repo.forks: | |
142 |
c.other_repos.append((fork.repo_name, |
|
139 | c.other_repos.append((fork.repo_name, fork.repo_name)) | |
143 | fork.user.username, fork.repo_name)) |
|
|||
144 | ) |
|
|||
145 | refs, default_ref = self._get_repo_refs(fork.scm_instance) |
|
140 | refs, default_ref = self._get_repo_refs(fork.scm_instance) | |
146 | other_repos_info[fork.repo_name] = { |
|
141 | other_repos_info[fork.repo_name] = { | |
147 | 'gravatar': h.gravatar_url(fork.user.email, 24), |
|
|||
148 | 'description': fork.description, |
|
142 | 'description': fork.description, | |
149 | 'revs': h.select('other_ref', default_ref, refs, class_='refs') |
|
143 | 'revs': h.select('other_ref', default_ref, refs, class_='refs') | |
150 | } |
|
144 | } | |
@@ -153,12 +147,8 class PullrequestsController(BaseRepoCon | |||||
153 | if org_repo.parent and org_repo.parent.scm_instance.revisions: |
|
147 | if org_repo.parent and org_repo.parent.scm_instance.revisions: | |
154 | c.default_other_repo = org_repo.parent.repo_name |
|
148 | c.default_other_repo = org_repo.parent.repo_name | |
155 | c.default_other_refs, c.default_other_ref = self._get_repo_refs(org_repo.parent.scm_instance) |
|
149 | c.default_other_refs, c.default_other_ref = self._get_repo_refs(org_repo.parent.scm_instance) | |
156 |
c.other_repos.append((org_repo.parent.repo_name, |
|
150 | c.other_repos.append((org_repo.parent.repo_name, org_repo.parent.repo_name)) | |
157 | org_repo.parent.user.username, |
|
|||
158 | org_repo.parent.repo_name)) |
|
|||
159 | ) |
|
|||
160 | other_repos_info[org_repo.parent.repo_name] = { |
|
151 | other_repos_info[org_repo.parent.repo_name] = { | |
161 | 'gravatar': h.gravatar_url(org_repo.parent.user.email, 24), |
|
|||
162 | 'description': org_repo.parent.description, |
|
152 | 'description': org_repo.parent.description, | |
163 | 'revs': h.select('other_ref', c.default_other_ref, c.default_other_refs, class_='refs') |
|
153 | 'revs': h.select('other_ref', c.default_other_ref, c.default_other_refs, class_='refs') | |
164 | } |
|
154 | } |
@@ -26,10 +26,7 | |||||
26 |
|
26 | |||
27 | ##ORG |
|
27 | ##ORG | |
28 | <div style="float:left"> |
|
28 | <div style="float:left"> | |
29 |
<div |
|
29 | <div> | |
30 | <div class="gravatar"> |
|
|||
31 | <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_db_repo.user.email,24)}"/> |
|
|||
32 | </div> |
|
|||
33 | <span style="font-size: 20px"> |
|
30 | <span style="font-size: 20px"> | |
34 | ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')} |
|
31 | ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')} | |
35 | </span> |
|
32 | </span> | |
@@ -43,10 +40,7 | |||||
43 |
|
40 | |||
44 | ##OTHER, most Probably the PARENT OF THIS FORK |
|
41 | ##OTHER, most Probably the PARENT OF THIS FORK | |
45 | <div style="float:left"> |
|
42 | <div style="float:left"> | |
46 |
<div |
|
43 | <div> | |
47 | <div class="gravatar"> |
|
|||
48 | <img id="other_repo_gravatar" alt="gravatar" src=""/> |
|
|||
49 | </div> |
|
|||
50 | <span style="font-size: 20px"> |
|
44 | <span style="font-size: 20px"> | |
51 | ${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')} |
|
45 | ${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')} | |
52 | </span> |
|
46 | </span> |
General Comments 0
You need to be logged in to leave comments.
Login now