kallithea Changeset - 995d938ce14b

Changeset - 995d938ce14b

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2012-06-19 22:13:32
marcin@python-works.com

Fixed origin repo in pull-request view

3 files changed with 3 insertions and 2 deletions:

rhodecode/controllers/compare.py

rhodecode/controllers/pullrequests.py

rhodecode/templates/compare/compare_cs.html

0 comments (0 inline, 0 general)

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -75,12 +75,13 @@ class CompareController(BaseRepoControll @@
         c.cs_ranges, discovery_data = PullRequestModel().get_compare_data(
                                        org_repo, org_ref, other_repo, other_ref
+                                      )
         c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
                                                    c.cs_ranges])
         c.target_repo = c.repo_name
         # defines that we need hidden inputs with changesets
         c.as_form = request.GET.get('as_form', False)
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return render('compare/compare_cs.html')
         c.org_ref = org_ref[1]

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -243,13 +243,13 @@ class PullrequestsController(BaseRepoCon @@
         # changeset(pull-request) status
         c.current_changeset_status = cs_model.calculate_status(
                                         c.pull_request_reviewers
+                                     )
         c.changeset_statuses = ChangesetStatus.STATUSES
+        c.target_repo = c.pull_request.org_repo.repo_name
         return render('/pullrequests/pullrequest_show.html')
     @jsonify
     def comment(self, repo_name, pull_request_id):
         status = request.POST.get('changeset_status')

rhodecode/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
         <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),14)}"/></div></td>
         <td>
           %if cs.raw_id in c.statuses:
             <div title="${c.statuses[cs.raw_id][1]}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" /></div>
           %endif
         </td>
-        <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
+        <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.target_repo,revision=cs.raw_id))}
         %if c.as_form:
           ${h.hidden('revisions',cs.raw_id)}
         %endif
         </td>
         <td><div class="author">${h.person(cs.author)}</div></td>
         <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

0 comments (0 inline, 0 general)