Merge branch 'master' into lqc-trunk

[redakcja.git] / apps / explorer / views.py

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index eff1b04..2c9b17d 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -53,7 +53,7 @@ def file_list(request):
     })
 
 @permission_required('api.document.can_add')
     })
 
 @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
     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):    
 # = 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)
 
 
     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} )
     return direct_to_template(request, 'manager/pull_request.html', 
         extra_context = {'objects': objects} )