kallithea Changeset - 6564d82e1469

Changeset - 6564d82e1469

Parent rev.

Child rev.

[Not reviewed]

default

0 5 2

Mads Kiilerich - 11 years ago 2014-07-18 18:44:54
madski@unity3d.com

pull requests: add new "my" page, separate from "my account" and prominently shown in the page headers

7 files changed with 230 insertions and 73 deletions:

kallithea/config/routing.py

kallithea/controllers/pullrequests.py

kallithea/lib/base.py

kallithea/model/pull_request.py

kallithea/templates/base/base.html

kallithea/templates/pullrequests/pullrequest_show_my.html

kallithea/templates/pullrequests/pullrequest_show_my_data.html

0 comments (0 inline, 0 general)

kallithea/config/routing.py

➞

Show inline comments

@@ @@ -709,24 +709,33 @@ def make_map(config): @@
     rmap.connect('pullrequest_delete',
                  '/{repo_name:.*?}/pull-request/{pull_request_id}',
                  controller='pullrequests',
                  action='delete', conditions=dict(function=check_repo,
                                                 method=["DELETE"]))
     rmap.connect('pullrequest_show_all',
                  '/{repo_name:.*?}/pull-request',
                  controller='pullrequests',
                  action='show_all', conditions=dict(function=check_repo,
                                                 method=["GET"]))
     rmap.connect('my_pullrequests',
                  '/my_pullrequests',
                  controller='pullrequests',
                  action='show_my', conditions=dict(method=["GET"]))
     rmap.connect('my_pullrequests_data',
                  '/my_pullrequests_data',
                  controller='pullrequests',
                  action='show_my_data', conditions=dict(method=["GET"]))
     rmap.connect('pullrequest_comment',
                  '/{repo_name:.*?}/pull-request-comment/{pull_request_id}',
                  controller='pullrequests',
                  action='comment', conditions=dict(function=check_repo,
                                                 method=["POST"]))
     rmap.connect('pullrequest_comment_delete',
                  '/{repo_name:.*?}/pull-request-comment/{comment_id}/delete',
                 controller='pullrequests', action='delete_comment',
                 conditions=dict(function=check_repo, method=["DELETE"]))
     rmap.connect('summary_home_summary', '/{repo_name:.*?}/summary',

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -39,25 +39,26 @@ from pylons.i18n.translation import _ @@
 from kallithea.lib.compat import json
 from kallithea.lib.base import BaseRepoController, render
 from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\
     NotAnonymous
 from kallithea.lib.helpers import Page
 from kallithea.lib import helpers as h
 from kallithea.lib import diffs
 from kallithea.lib.utils import action_logger, jsonify
 from kallithea.lib.vcs.utils import safe_str
 from kallithea.lib.vcs.exceptions import EmptyRepositoryError
 from kallithea.lib.diffs import LimitedDiffContainer
 from kallithea.model.db import  PullRequest, ChangesetStatus, ChangesetComment
 from kallithea.model.db import  PullRequest, ChangesetStatus, ChangesetComment,\
     PullRequestReviewers
 from kallithea.model.pull_request import PullRequestModel
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.comment import ChangesetCommentsModel
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.forms import PullRequestForm
 from kallithea.lib.utils2 import safe_int
 log = logging.getLogger(__name__)
 class PullrequestsController(BaseRepoController):
@@ @@ -248,24 +249,52 @@ class PullrequestsController(BaseRepoCon @@
         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')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.pullrequest_data
         return render('/pullrequests/pullrequest_show_all.html')
     @LoginRequired()
     def show_my(self): # my_account_my_pullrequests
         c.show_closed = request.GET.get('pr_show_closed')
         return render('/pullrequests/pullrequest_show_my.html')
     @NotAnonymous()
     def show_my_data(self):
         c.show_closed = request.GET.get('pr_show_closed')
         def _filter(pr):
             s = sorted(pr, key=lambda o: o.created_on, reverse=True)
             if not c.show_closed:
                 s = filter(lambda p: p.status != PullRequest.STATUS_CLOSED, s)
             return s
         c.my_pull_requests = _filter(PullRequest.query()\
                                 .filter(PullRequest.user_id ==
                                         self.authuser.user_id)\
                                 .all())
         c.participate_in_pull_requests = _filter(PullRequest.query()\
                                 .join(PullRequestReviewers)\
                                 .filter(PullRequestReviewers.user_id ==
                                         self.authuser.user_id)\
+                                                 )
         return render('/pullrequests/pullrequest_show_my_data.html')
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def index(self):
         org_repo = c.db_repo
         try:
             org_repo.scm_instance.get_changeset()
         except EmptyRepositoryError, e:
             h.flash(h.literal(_('There are no changesets yet')),
                     category='warning')
             redirect(url('summary_home', repo_name=org_repo.repo_name))

kallithea/lib/base.py

➞

Show inline comments

@@ @@ -46,24 +46,25 @@ from kallithea import __version__, BACKE @@
 from kallithea.lib.utils2 import str2bool, safe_unicode, AttributeDict,\
     safe_str, safe_int
 from kallithea.lib import auth_modules
 from kallithea.lib.auth import AuthUser, HasPermissionAnyMiddleware, CookieStoreWrapper
 from kallithea.lib.utils import get_repo_slug
 from kallithea.lib.exceptions import UserCreationError
 from kallithea.model import meta
 from kallithea.model.db import Repository, Ui, User, Setting
 from kallithea.model.notification import NotificationModel
 from kallithea.model.scm import ScmModel
 from kallithea.model.meta import Session
 from kallithea.model.pull_request import PullRequestModel
 log = logging.getLogger(__name__)
 def _filter_proxy(ip):
     """
     HEADERS can have multiple ips inside the left-most being the original
     client, and each successive proxy that passed the request adding the IP
     address where it received the request from.
     :param ip:
     """
@@ @@ -310,24 +311,27 @@ class BaseController(WSGIController): @@
         c.visual.allow_custom_hooks_settings = str2bool(config.get('allow_custom_hooks_settings', True))
         c.instance_id = config.get('instance_id')
         c.issues_url = config.get('bugtracker', url('issues_url'))
         # END CONFIG VARS
         c.repo_name = get_repo_slug(request)  # can be empty
         c.backends = BACKENDS.keys()
         c.unread_notifications = NotificationModel()\
                         .get_unread_cnt_for_user(c.authuser.user_id)
         self.cut_off_limit = safe_int(config.get('cut_off_limit'))
         c.my_pr_count = PullRequestModel().get_pullrequest_cnt_for_user(c.authuser.user_id)
         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
         # available in environ['pylons.routes_dict']
         try:
             self.ip_addr = _get_ip_addr(environ)
             # make sure that we update permissions each time we call controller
             api_key = request.GET.get('api_key')

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -40,24 +40,31 @@ from kallithea.lib.utils2 import safe_un @@
 log = logging.getLogger(__name__)
 class PullRequestModel(BaseModel):
     cls = PullRequest
     def __get_pull_request(self, pull_request):
         return self._get_instance(PullRequest, pull_request)
     def get_pullrequest_cnt_for_user(self, user):
         return PullRequest.query()\
                                 .join(PullRequestReviewers)\
                                 .filter(PullRequestReviewers.user_id == user)\
                                 .filter(PullRequest.status != PullRequest.STATUS_CLOSED)\
                                 .count()
     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)

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -213,44 +213,115 @@ @@
              YUD.addClass('branch_tag_switcher_2','loaded');
              ypjax("${h.url('branch_tag_switcher',repo_name=c.repo_name)}",'switch_to_list_2',
                  function(o){},
                  function(o){YUD.removeClass('branch_tag_switcher_2','loaded');}
                  ,null);
+         }
          return false;
       });
   </script>
   <!--- END CONTEXT BAR -->
 </%def>
 <%def name="usermenu()">
 <%def name="menu(current=None)">
   <%
   def is_current(selected):
       if selected == current:
           return h.literal('class="current"')
   %>
   <ul id="quick" class="horizontal-list">
     <!-- repo switcher -->
     <li ${is_current('repositories')}>
       <input id="repo_switcher" name="repo_switcher" type="hidden">
     </li>
     ##ROOT MENU
     %if c.authuser.username != 'default':
       <li ${is_current('journal')}>
         <a class="menu_link" title="${_('Show recent activity')}"  href="${h.url('journal')}">
           <i class="icon-book"></i> ${_('Journal')}
         </a>
       </li>
     %else:
       <li ${is_current('journal')}>
         <a class="menu_link" title="${_('Public journal')}"  href="${h.url('public_journal')}">
           <i class="icon-book"></i> ${_('Public journal')}
         </a>
       </li>
     %endif
       <li ${is_current('gists')}>
         <a class="menu_link childs" title="${_('Show public gists')}"  href="${h.url('gists')}">
           <i class="icon-file-2"></i> ${_('Gists')}
         </a>
           <ul class="admin_menu">
             <li><a href="${h.url('new_gist', public=1)}"><i class="icon-file-alt"></i> ${_('Create new gist')}</a></li>
             <li><a href="${h.url('gists')}"><i class="icon-copy"></i> ${_('All public gists')}</a></li>
             %if c.authuser.username != 'default':
               <li><a href="${h.url('gists', public=1)}"><i class="icon-copy"></i> ${_('My public gists')}</a></li>
               <li><a href="${h.url('gists', private=1)}"><i class="icon-file-text"></i> ${_('My private gists')}</a></li>
             %endif
           </ul>
       </li>
     <li ${is_current('search')}>
         <a class="menu_link" title="${_('Search in repositories')}"  href="${h.url('search')}">
           <i class="icon-search"></i> ${_('Search')}
         </a>
     </li>
     % if h.HasPermissionAll('hg.admin')('access admin main page'):
       <li ${is_current('admin')}>
         <a class="menu_link childs" title="${_('Admin')}" href="${h.url('admin_home')}">
           <i class="icon-cog"></i> ${_('Admin')}
         </a>
         ${admin_menu()}
       </li>
     % elif c.authuser.repositories_admin or c.authuser.repository_groups_admin or c.authuser.user_groups_admin:
     <li ${is_current('admin')}>
         <a class="menu_link childs" title="${_('Admin')}">
           <i class="icon-cog"></i> ${_('Admin')}
         </a>
         ${admin_menu_simple(c.authuser.repositories_admin,
                             c.authuser.repository_groups_admin,
                             c.authuser.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
     </li>
     % endif
     <li ${is_current('my_pullrequests')}>
       <a class="menu_link" title="${_('My Pull Requests')}" href="${h.url('my_pullrequests')}">
         <i class="icon-code-fork"></i> ${_('My Pull Requests')}
         %if c.my_pr_count != 0:
           <span class="menu_link_notifications">${c.my_pr_count}</span>
         %endif
       </a>
     </li>
     ## USER MENU
     <li>
       <a class="menu_link childs" id="quick_login_link">
           <span class="icon">
              <img src="${h.gravatar_url(c.authuser.email,20)}" alt="avatar">
           </span>
           %if c.authuser.username != 'default':
             <span class="menu_link_user">${c.authuser.username}</span>
             %if c.unread_notifications != 0:
               <span class="menu_link_notifications">${c.unread_notifications}</span>
             %endif
           %else:
               <span>${_('Not logged in')}</span>
           %endif
       </a>
   <div class="user-menu">
       <div id="quick_login">
         %if c.authuser.username == 'default':
       <div class="user-menu">
         <div id="quick_login">
           %if c.authuser.username == 'default':
             <h4>${_('Login to your account')}</h4>
             ${h.form(h.url('login_home',came_from=h.url.current()))}
             <div class="form">
                 <div class="fields">
                     <div class="field">
                         <div class="label">
                             <label for="username">${_('Username')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('username',class_='focus')}
                         </div>
@@ @@ -269,106 +340,41 @@ @@
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                         %endif
                         </div>
                         <div class="submit">
                             ${h.submit('sign_in',_('Log In'),class_="btn btn-mini")}
                         </div>
                     </div>
                 </div>
             </div>
             ${h.end_form()}
         %else:
+          %else:
             <div class="links_left">
                 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.authuser.email,48)}" /></div>
                 <div class="full_name">${c.authuser.full_name_or_username}</div>
                 <div class="email">${c.authuser.email}</div>
             </div>
             <div class="links_right">
             <ol class="links">
               <li><a href="${h.url('notifications')}">${_('Notifications')}: ${c.unread_notifications}</a></li>
               <li>${h.link_to(_(u'My account'),h.url('my_account'))}</li>
               <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
             </ol>
             </div>
         %endif
           %endif
         </div>
       </div>
   </div>
     </li>
 </%def>
 <%def name="menu(current=None)">
         <%
         def is_current(selected):
             if selected == current:
                 return h.literal('class="current"')
         %>
         <ul id="quick" class="horizontal-list">
           <!-- repo switcher -->
           <li ${is_current('repositories')}>
             <input id="repo_switcher" name="repo_switcher" type="hidden">
           </li>
           ##ROOT MENU
           %if c.authuser.username != 'default':
             <li ${is_current('journal')}>
               <a class="menu_link" title="${_('Show recent activity')}"  href="${h.url('journal')}">
                 <i class="icon-book"></i> ${_('Journal')}
               </a>
             </li>
           %else:
             <li ${is_current('journal')}>
               <a class="menu_link" title="${_('Public journal')}"  href="${h.url('public_journal')}">
                 <i class="icon-book"></i> ${_('Public journal')}
               </a>
             </li>
           %endif
             <li ${is_current('gists')}>
               <a class="menu_link childs" title="${_('Show public gists')}"  href="${h.url('gists')}">
                 <i class="icon-file-2"></i> ${_('Gists')}
               </a>
                 <ul class="admin_menu">
                   <li><a href="${h.url('new_gist', public=1)}"><i class="icon-file-alt"></i> ${_('Create new gist')}</a></li>
                   <li><a href="${h.url('gists')}"><i class="icon-copy"></i> ${_('All public gists')}</a></li>
                   %if c.authuser.username != 'default':
                     <li><a href="${h.url('gists', public=1)}"><i class="icon-copy"></i> ${_('My public gists')}</a></li>
                     <li><a href="${h.url('gists', private=1)}"><i class="icon-file-text"></i> ${_('My private gists')}</a></li>
                   %endif
                 </ul>
             </li>
           <li ${is_current('search')}>
               <a class="menu_link" title="${_('Search in repositories')}"  href="${h.url('search')}">
                 <i class="icon-search"></i> ${_('Search')}
               </a>
           </li>
           % if h.HasPermissionAll('hg.admin')('access admin main page'):
             <li ${is_current('admin')}>
               <a class="menu_link childs" title="${_('Admin')}" href="${h.url('admin_home')}">
                 <i class="icon-cog"></i> ${_('Admin')}
               </a>
               ${admin_menu()}
             </li>
           % elif c.authuser.repositories_admin or c.authuser.repository_groups_admin or c.authuser.user_groups_admin:
           <li ${is_current('admin')}>
               <a class="menu_link childs" title="${_('Admin')}">
                 <i class="icon-cog"></i> ${_('Admin')}
               </a>
               ${admin_menu_simple(c.authuser.repositories_admin,
                                   c.authuser.repository_groups_admin,
                                   c.authuser.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
           </li>
           % endif
           ${usermenu()}
     <script type="text/javascript">
         var visual_show_public_icon = "${c.visual.show_public_icon}" == "True";
         var cache = {}
         /*format the look of items in the list*/
         var format = function(state){
             if (!state.id){
               return state.text; // optgroup
+            }
             var obj_dict = state.obj;
             var tmpl = '';

kallithea/templates/pullrequests/pullrequest_show_my.html

➞

Show inline comments

@@ new file 100644 @@
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('My Pull Requests')} &middot; ${c.site_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('My Pull Requests')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('my_pullrequests')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div id="pullrequests_container" class="table">
         ## loaded via AJAX
         ${_('Loading...')}
     </div>
 <script type="text/javascript">
 pyroutes.register('my_pullrequests_data', "${url('my_pullrequests_data')}", []);
 var show_pullrequests = function(e){
     var url = pyroutes.url('my_pullrequests_data');
     if(YUD.get('show_closed') && YUD.get('show_closed').checked) {
         var url = pyroutes.url('my_pullrequests_data', {'pr_show_closed': '1'});
+    }
     ypjax(url, 'pullrequests_container', function(){
         YUE.on('show_closed','change',function (e) {
             show_pullrequests(e);
         });
     });
+}
 show_pullrequests()
 </script>
 </div>
 </%def>

kallithea/templates/pullrequests/pullrequest_show_my_data.html

➞

Show inline comments

@@ new file 100644 @@
 %if c.show_closed:
   ${h.checkbox('show_closed',checked="checked", label=_('Show closed pull requests'))}
 %else:
   ${h.checkbox('show_closed',label=_('Show closed pull requests'))}
 %endif
 <div class="pullrequests_section_head">${_('Opened by me')}</div>
 <ul>
     %if c.my_pull_requests:
       %for pull_request in c.my_pull_requests:
       <li class="${'closed' if pull_request.is_closed() else ''}">
         <div style="height: 12px">
           <div style="float:left">
             <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
             <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
               ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}
               %if pull_request.is_closed():
                 (${_('Closed')})
               %endif
             </a>
           </div>
           <div style="float:left">
             ${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}
               ${h.submit('remove_%s' % pull_request.pull_request_id, '', title=_('Delete Pull Request'),class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
             ${h.end_form()}
           </div>
         </div>
       </li>
       %endfor
    %else:
     <li><span class="empty_data">${_('Nothing here yet')}</span></li>
    %endif
 </ul>
 <div class="pullrequests_section_head" style="clear:both">${_('I participate in')}</div>
 <ul>
     %if c.participate_in_pull_requests:
       %for pull_request in c.participate_in_pull_requests:
       <li class="${'closed' if pull_request.is_closed() else ''}">
         <div style="height: 12px">
           <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
           <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
             ${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))}
           </a>
           %if pull_request.is_closed():
             (${_('Closed')})
           %endif
         </div>
       </li>
       %endfor
     %else:
      <li><span class="empty_data">${_('Nothing here yet')}</span></li>
     %endif
 </ul>

0 comments (0 inline, 0 general)