X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/39d26aa0f2cb893f19282657b2fddd2a494f2263..eba3cb48e4c226b4229e2e38fa390672c3bcc829:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py index eff1b044..2c9b17da 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -53,7 +53,7 @@ def file_list(request): }) @permission_required('api.document.can_add') -def file_upload(request, repo): +def file_upload(request): from api.resources import library_resource from api.forms import DocumentUploadForm from django.http import HttpRequest, HttpResponseRedirect @@ -109,11 +109,10 @@ def _get_issues_for_file(fileid): # = Pull requests = # ================= def pull_requests(request): - objects = PullRequest.objects.order_by('status') + objects = PullRequest.objects.order_by('-status', 'timestamp') if not request.user.has_perm('explorer.book.can_share'): objects = objects.filter(comitter=request.user) - return direct_to_template(request, 'manager/pull_request.html', extra_context = {'objects': objects} )