kallithea Changeset - 7b9d4f6bb04e

Changeset - 7b9d4f6bb04e

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 13 years ago 2013-03-24 20:24:17
marcin@python-works.com

show only open pull requests in the counter, and use repo context bar in pull requests view

5 files changed with 5 insertions and 7 deletions:

rhodecode/lib/base.py

rhodecode/model/scm.py

rhodecode/templates/pullrequests/pullrequest.html

rhodecode/templates/pullrequests/pullrequest_show.html

rhodecode/templates/pullrequests/pullrequest_show_all.html

0 comments (0 inline, 0 general)

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -257,26 +257,25 @@ class BaseController(WSGIController): @@
         c.use_gravatar = str2bool(config.get('use_gravatar'))
         c.ga_code = config.get('rhodecode_ga_code')
         # Visual options
         c.visual = AttributeDict({})
         rc_config = RhodeCodeSetting.get_app_settings()
         c.visual.show_public_icon = str2bool(rc_config.get('rhodecode_show_public_icon'))
         c.visual.show_private_icon = str2bool(rc_config.get('rhodecode_show_private_icon'))
         c.visual.stylify_metatags = str2bool(rc_config.get('rhodecode_stylify_metatags'))
         c.visual.lightweight_dashboard = str2bool(rc_config.get('rhodecode_lightweight_dashboard'))
         c.visual.lightweight_dashboard_items = safe_int(config.get('dashboard_items', 100))
         c.visual.repository_fields = str2bool(rc_config.get('rhodecode_repository_fields'))
         c.repo_name = get_repo_slug(request)
         c.repo_name = get_repo_slug(request)  # can be empty
         c.backends = BACKENDS.keys()
         c.unread_notifications = NotificationModel()\
                         .get_unread_cnt_for_user(c.rhodecode_user.user_id)
         self.cut_off_limit = int(config.get('cut_off_limit'))
         self.sa = meta.Session
         self.scm_model = ScmModel(self.sa)
     def __call__(self, environ, start_response):
         """Invoke the Controller"""
         # WSGIController.__call__ dispatches to the Controller method
         # the request is routed to. This routing information is

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -384,25 +384,26 @@ class ScmModel(BaseModel): @@
         return self.sa.query(UserFollowing)\
                 .filter(UserFollowing.follows_repository == repo).count()
     def get_forks(self, repo):
         repo = self._get_repo(repo)
         return self.sa.query(Repository)\
                 .filter(Repository.fork == repo).count()
     def get_pull_requests(self, repo):
         repo = self._get_repo(repo)
         return self.sa.query(PullRequest)\
                 .filter(PullRequest.other_repo == repo).count()
                 .filter(PullRequest.other_repo == repo)\
                 .filter(PullRequest.status != PullRequest.STATUS_CLOSED).count()
     def mark_as_fork(self, repo, fork, user):
         repo = self.__get_repo(repo)
         fork = self.__get_repo(fork)
         if fork and repo.repo_id == fork.repo_id:
             raise Exception("Cannot set repository as fork of itself")
         repo.fork = fork
         self.sa.add(repo)
         return repo
     def _handle_push(self, repo, username, action, repo_name, revisions):
         """

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
     ${c.repo_name} ${_('New pull request')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_(u'Home'),h.url('/'))}
     &raquo;
     ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
     &raquo;
     ${_('new pull request')}
 </%def>
 <%def name="main()">
+${self.context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
     <div style="float:left;padding:0px 30px 30px 30px">
         ##ORG
         <div style="float:left">
             <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')}

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
     ${c.repo_name} ${_('Pull request #%s') % c.pull_request.pull_request_id}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_(u'Home'),h.url('/'))}
     &raquo;
     ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
     &raquo;
     ${_('Pull request #%s') % c.pull_request.pull_request_id}
 </%def>
 <%def name="main()">
+${self.context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
         %if c.pull_request.is_closed():
         <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))} ${_('with status %s') % h.changeset_status_lbl(c.current_changeset_status)}</div>
         %endif
     <h3>
     %if c.pull_request.is_closed():
         <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
     %endif

rhodecode/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -26,15 +26,13 @@ ${self.context_bar('showpullrequest')} @@
             <a href="${h.url('pullrequest_show',repo_name=c.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>
           </h4>
           <h5 style="border:0px;padding-bottom:0px">${_('Title')}: ${pr.title}</h5>
           <div style="padding:0px 24px">${pr.description}</div>
           <div style="border-bottom: 1px solid #DDD;margin:10px 20px;padding-bottom:10px"></div>
         </div>
     %endfor
 </div>
 <script type="text/javascript"></script>
 </%def>

0 comments (0 inline, 0 general)