kallithea Changeset - dcd1c159a132

Changeset - dcd1c159a132

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Mads Kiilerich - 13 years ago 2013-02-04 22:34:47
madski@unity3d.com

pull request: don't show fake path with owner names - and owner avatars is also not relevant

2 files changed with 5 insertions and 21 deletions:

rhodecode/controllers/pullrequests.py

rhodecode/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -120,9 +120,7 @@ class PullrequestsController(BaseRepoCon @@
         other_repos_info = {}
         c.org_repos = []
         c.org_repos.append((org_repo.repo_name, '%s/%s' % (
                                 org_repo.user.username, org_repo.repo_name))
+                           )
         c.org_repos.append((org_repo.repo_name, org_repo.repo_name))
         c.default_org_repo = org_repo.repo_name
         c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance)
@@ @@ -132,19 +130,15 @@ class PullrequestsController(BaseRepoCon @@
         c.default_other_repo = org_repo.repo_name
         c.default_other_refs, c.default_other_ref = self._get_repo_refs(org_repo.scm_instance)
         other_repos_info[org_repo.repo_name] = {
             'gravatar': h.gravatar_url(org_repo.user.email, 24),
             'description': org_repo.description,
             'revs': h.select('other_ref', c.default_other_ref, c.default_other_refs, class_='refs')
+        }
         # gather forks and add to this list ... even though it is rare to request forks to pull their parent
         for fork in org_repo.forks:
             c.other_repos.append((fork.repo_name, '%s/%s' % (
                                     fork.user.username, fork.repo_name))
+                                 )
             c.other_repos.append((fork.repo_name, fork.repo_name))
             refs, default_ref = self._get_repo_refs(fork.scm_instance)
             other_repos_info[fork.repo_name] = {
                 'gravatar': h.gravatar_url(fork.user.email, 24),
                 'description': fork.description,
                 'revs': h.select('other_ref', default_ref, refs, class_='refs')
+            }
@@ @@ -153,12 +147,8 @@ class PullrequestsController(BaseRepoCon @@
         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)
             c.other_repos.append((org_repo.parent.repo_name, '%s/%s' % (
                                         org_repo.parent.user.username,
                                         org_repo.parent.repo_name))
+                                     )
             c.other_repos.append((org_repo.parent.repo_name, org_repo.parent.repo_name))
             other_repos_info[org_repo.parent.repo_name] = {
                 'gravatar': h.gravatar_url(org_repo.parent.user.email, 24),
                 'description': org_repo.parent.description,
                 'revs': h.select('other_ref', c.default_other_ref, c.default_other_refs, class_='refs')
+            }

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -26,10 +26,7 @@ @@
         ##ORG
         <div style="float:left">
             <div class="fork_user">
                 <div class="gravatar">
                     <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_db_repo.user.email,24)}"/>
                 </div>
             <div>
                 <span style="font-size: 20px">
                 ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}
                 </span>
@@ @@ -43,10 +40,7 @@ @@
         ##OTHER, most Probably the PARENT OF THIS FORK
         <div style="float:left">
             <div class="fork_user">
                 <div class="gravatar">
                     <img id="other_repo_gravatar" alt="gravatar" src=""/>
                 </div>
             <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')}
                 </span>

0 comments (0 inline, 0 general)