X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/0600fa257660dd107bada5971b3296b3244fea03..8d490fc7810e0052bad3414b445b24276bbfca63:/apps/explorer/views.py diff --git a/apps/explorer/views.py b/apps/explorer/views.py index b17b8c8e..5ec452ae 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -13,8 +13,10 @@ from django.utils import simplejson as json from django.views.generic.simple import direct_to_template from django.contrib.auth.decorators import login_required +from explorer import forms from api.models import PullRequest + def ajax_login_required(view): """Similar ro @login_required, but instead of redirect, just return some JSON stuff with error.""" @@ -28,11 +30,12 @@ def ajax_login_required(view): @login_required def display_editor(request, path): user = request.GET.get('user', request.user.username) - log.info(user) + gallery_form = forms.GalleryChoiceForm() return direct_to_template(request, 'explorer/editor.html', extra_context={ 'fileid': path, - 'euser': user + 'euser': user, + 'gallery_form': gallery_form, }) # @@ -109,11 +112,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} )