Mercurial > kallithea
changeset 2487:995d938ce14b beta
Fixed origin repo in pull-request view
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 19 Jun 2012 22:13:32 +0200 |
| parents | 6f537e3da9c4 |
| children | b5b34d71b23b |
| files | rhodecode/controllers/compare.py rhodecode/controllers/pullrequests.py rhodecode/templates/compare/compare_cs.html |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/compare.py Tue Jun 19 21:42:14 2012 +0200 +++ b/rhodecode/controllers/compare.py Tue Jun 19 22:13:32 2012 +0200 @@ -78,6 +78,7 @@ 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'):
--- a/rhodecode/controllers/pullrequests.py Tue Jun 19 21:42:14 2012 +0200 +++ b/rhodecode/controllers/pullrequests.py Tue Jun 19 22:13:32 2012 +0200 @@ -246,7 +246,7 @@ 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
--- a/rhodecode/templates/compare/compare_cs.html Tue Jun 19 21:42:14 2012 +0200 +++ b/rhodecode/templates/compare/compare_cs.html Tue Jun 19 22:13:32 2012 +0200 @@ -12,7 +12,7 @@ <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