comparison rhodecode/controllers/admin/settings.py @ 3404:7854097b189c beta

Hide closed pull requests on my page.
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 25 Feb 2013 23:17:33 +0100
parents 1c4505e3be5b
children d5ae996eed11
comparison
equal deleted inserted replaced
3403:07f4193083fd 3404:7854097b189c
472 472
473 return redirect(url('my_account')) 473 return redirect(url('my_account'))
474 474
475 @NotAnonymous() 475 @NotAnonymous()
476 def my_account_my_pullrequests(self): 476 def my_account_my_pullrequests(self):
477 c.my_pull_requests = PullRequest.query()\ 477 c.show_closed = request.GET.get('pr_show_closed')
478
479 def _filter(pr):
480 s = sorted(pr, key=lambda o: o.created_on, reverse=True)
481 if not c.show_closed:
482 s = filter(lambda p: p.status != PullRequest.STATUS_CLOSED, s)
483 return s
484
485 c.my_pull_requests = _filter(PullRequest.query()\
478 .filter(PullRequest.user_id == 486 .filter(PullRequest.user_id ==
479 self.rhodecode_user.user_id)\ 487 self.rhodecode_user.user_id)\
480 .order_by(PullRequest.created_on.desc())\ 488 .all())
481 .all() 489
482 490 c.participate_in_pull_requests = _filter([
483 c.participate_in_pull_requests = sorted( 491 x.pull_request for x in PullRequestReviewers.query()\
484 [x.pull_request for x in PullRequestReviewers.query()\ 492 .filter(PullRequestReviewers.user_id ==
485 .filter(PullRequestReviewers.user_id == 493 self.rhodecode_user.user_id).all()])
486 self.rhodecode_user.user_id)\
487 .all()],
488 key=lambda o: o.created_on, reverse=True)
489 494
490 return render('admin/users/user_edit_my_account_pullrequests.html') 495 return render('admin/users/user_edit_my_account_pullrequests.html')
491 496
492 @NotAnonymous() 497 @NotAnonymous()
493 def create_repository(self): 498 def create_repository(self):