kallithea Changeset - 7854097b189c

Changeset - 7854097b189c

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2013-02-25 23:17:33
marcin@python-works.com

Hide closed pull requests on my page.

3 files changed with 29 insertions and 11 deletions:

rhodecode/controllers/admin/settings.py

rhodecode/templates/admin/users/user_edit_my_account.html

rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -465,36 +465,41 @@ class SettingsController(BaseController) @@
                 prefix_error=False,
                 encoding="UTF-8")
             return render('admin/users/user_edit_my_account.html')
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during update of user %s') \
                     % form_result.get('username'), category='error')
         return redirect(url('my_account'))
     @NotAnonymous()
     def my_account_my_pullrequests(self):
         c.my_pull_requests = PullRequest.query()\
         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.rhodecode_user.user_id)\
                                 .order_by(PullRequest.created_on.desc())\
                                 .all()
                                 .all())
         c.participate_in_pull_requests = sorted(
             [x.pull_request for x in PullRequestReviewers.query()\
         c.participate_in_pull_requests = _filter([
                     x.pull_request for x in PullRequestReviewers.query()\
                                     .filter(PullRequestReviewers.user_id ==
                                             self.rhodecode_user.user_id)\
                                     .all()],
                                     key=lambda o: o.created_on, reverse=True)
                             self.rhodecode_user.user_id).all()])
         return render('admin/users/user_edit_my_account_pullrequests.html')
     @NotAnonymous()
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
         parent_group = request.GET.get('parent_group')
         if not HasPermissionAny('hg.admin', 'hg.create.repository')():
             #you're not super admin nor have global create permissions,
             #but maybe you have at least write permission to a parent group ?
             _gr = RepoGroup.get(parent_group)

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -93,24 +93,25 @@ @@
     </div>
     <div id="my_container" style="display:none">
         <div class="table yui-skin-sam" id="repos_list_wrap"></div>
         <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
     </div>
     <div id="pullrequests_container" class="table" style="display:none">
         ## loaded via AJAX
         ${_('Loading...')}
     </div>
 </div>
 <script type="text/javascript">
 pyroutes.register('admin_settings_my_pullrequests', "${url('admin_settings_my_pullrequests')}", []);
 var show_perms = function(e){
     YUD.addClass('show_perms', 'current');
     YUD.removeClass('show_my','current');
     YUD.removeClass('show_pullrequests','current');
     YUD.setStyle('my_container','display','none');
     YUD.setStyle('pullrequests_container','display','none');
     YUD.setStyle('perms_container','display','');
     YUD.setStyle('q_filter','display','none');
+}
 YUE.on('show_perms','click',function(e){
@@ @@ -136,26 +137,33 @@ YUE.on('show_my','click',function(e){ @@
 })
 var show_pullrequests = function(e){
     YUD.addClass('show_pullrequests', 'current');
     YUD.removeClass('show_my','current');
     YUD.removeClass('show_perms','current');
     YUD.setStyle('my_container','display','none');
     YUD.setStyle('perms_container','display','none');
     YUD.setStyle('pullrequests_container','display','');
     YUD.setStyle('q_filter','display','none');
     var url = "${h.url('admin_settings_my_pullrequests')}";
     ypjax(url, 'pullrequests_container');
     var url = pyroutes.url('admin_settings_my_pullrequests');
     if(YUD.get('show_closed') && YUD.get('show_closed').checked) {
     	var url = pyroutes.url('admin_settings_my_pullrequests', {'pr_show_closed': '1'});
+    }
     ypjax(url, 'pullrequests_container', function(){
         YUE.on('show_closed','change',function (e) {
             show_pullrequests(e);
         });
     });
+}
 YUE.on('show_pullrequests','click',function(e){
     show_pullrequests(e)
 })
 var tabs = {
     'perms': show_perms,
     'my': show_my,
     'pullrequests': show_pullrequests
+}
 var url = location.href.split('#');
 if (url[1]) {
@@ @@ -261,15 +269,16 @@ function table_renderer(data){ @@
       YUE.on('q_filter','click',function(){
           if(!YUD.hasClass('q_filter', 'loaded')){
               YUD.get('q_filter').value = '';
               //TODO: load here full list later to do search within groups
               YUD.addClass('q_filter', 'loaded');
+          }
        });
       YUE.on('q_filter','keyup',function (e) {
           clearTimeout(filterTimeout);
           filterTimeout = setTimeout(updateFilter,600);
       });
+    }
 </script>
 </%def>

rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html

➞

Show inline comments

 %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>
         <div style="height: 12px">
           <div style="float:left">
           %if pull_request.is_closed():
               <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
           %endif
           <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)}">

0 comments (0 inline, 0 general)