kallithea Changeset - 73ef2a5d3042

Changeset - 73ef2a5d3042

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 13 years ago 2013-06-05 01:16:42
madski@unity3d.com

Grafted from: 5ccca2e806df

pull requests: make it possible control display of closed PRs and whether it is PRs to or from repo

5 files changed with 43 insertions and 10 deletions:

rhodecode/controllers/pullrequests.py

rhodecode/model/pull_request.py

rhodecode/templates/base/base.html

rhodecode/templates/pullrequests/pullrequest_data.html

rhodecode/templates/pullrequests/pullrequest_show_all.html

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -223,13 +223,15 @@ class PullrequestsController(BaseRepoCon @@
             c.changes[fid] = [f['operation'], f['filename'], htmldiff]
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def show_all(self, repo_name):
         c.pull_requests = PullRequestModel().get_all(repo_name)
         c.from_ = request.GET.get('from_') or ''
         c.closed = request.GET.get('closed') or ''
         c.pull_requests = PullRequestModel().get_all(repo_name, from_=c.from_, closed=c.closed)
         c.repo_name = repo_name
         p = safe_int(request.GET.get('page', 1), 1)
         c.pullrequests_pager = Page(c.pull_requests, page=p, items_per_page=10)
         c.pullrequest_data = render('/pullrequests/pullrequest_data.html')

rhodecode/model/pull_request.py

➞

Show inline comments

@@ @@ -44,18 +44,25 @@ class PullRequestModel(BaseModel): @@
     cls = PullRequest
     def __get_pull_request(self, pull_request):
         return self._get_instance(PullRequest, pull_request)
     def get_all(self, repo):
         repo = self._get_repo(repo)
         return PullRequest.query()\
                 .filter(PullRequest.other_repo == repo)\
                 .order_by(PullRequest.created_on.desc())\
                 .all()
     def get_all(self, repo_name, from_=False, closed=False):
         """Get all PRs for repo.
         Default is all PRs to the repo, PRs from the repo if from_.
         Closed PRs are only included if closed is true."""
         repo = self._get_repo(repo_name)
         q = PullRequest.query()
         if from_:
             q = q.filter(PullRequest.org_repo == repo)
         else:
             q = q.filter(PullRequest.other_repo == repo)
         if not closed:
             q = q.filter(PullRequest.status != PullRequest.STATUS_CLOSED)
         return q.order_by(PullRequest.created_on.desc()).all()
     def create(self, created_by, org_repo, org_ref, other_repo, other_ref,
                revisions, reviewers, title, description=None):
         from rhodecode.model.changeset_status import ChangesetStatusModel
         created_by_user = self._get_user(created_by)

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -157,13 +157,13 @@ @@
                   <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="pull-request">${_('Create Pull Request')}</a></li>
                   %endif
               %endif
              </ul>
         </li>
         <li ${is_current('showpullrequest')}>
           <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests')}" class="pull-request">${_('Pull Requests')}
+          <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}" class="pull-request">${_('Pull Requests')}
             %if c.repository_pull_requests:
               <span>${c.repository_pull_requests}</span>
             %endif
           </a>
         </li>
       </ul>

rhodecode/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 % for pr in c.pullrequests_pager:
   <div class="pr ${'pr-closed' if pr.is_closed() else ''}">
     <div class="pr-title">
       <img src="${h.url('/images/icons/flag_status_%s.png' % str(pr.last_review_status))}" />
-      <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}">
+      <a href="${h.url('pullrequest_show',repo_name=pr.other_repo.repo_name,pull_request_id=pr.pull_request_id)}">
       ${_('Pull request #%s opened by %s on %s') % (pr.pull_request_id, pr.author.full_name, h.fmt_date(pr.created_on))}
       </a>
        %if pr.is_closed():
          <span class="pr-closed-tag">${_('Closed')}</span>
        %endif
     </div>

rhodecode/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -2,13 +2,17 @@ @@
 <%def name="title()">
     ${_('%s Pull Requests') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Pull requests')}
 %if c.from_:
     ${_('Pull requests from %s') % c.repo_name}
 %else:
     ${_('Pull requests to %s') % c.repo_name}
 %endif
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
@@ @@ -17,10 +21,30 @@ ${self.repo_context_bar('showpullrequest @@
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div style="margin: 0 20px">
         <div>
         %if c.from_:
             ${h.link_to(_('Instead, show pull requests to %s') % c.repo_name, h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed))}
         %else:
             ${h.link_to(_('Instead, show pull requests from %s') % c.repo_name, h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1))}
         %endif
         </div>
         <div>
         %if c.closed:
             ${h.link_to(_('Hide closed pull requests'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_))}
         %else:
             ${h.link_to(_('Show closed pull requests too'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))}
         %endif
         </div>
     </div>
     ${c.pullrequest_data}
 </div>
 </%def>

0 comments (0 inline, 0 general)