Merge branch 'master' into lqc-trunk

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

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
old mode 100644 (file)
new mode 100755 (executable)
index eff1b04..a67d27c
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -11,10 +11,14 @@ from django.core.urlresolvers import reverse
 from django.http import HttpResponse
 from django.utils import simplejson as json
 from django.views.generic.simple import direct_to_template
+from django.shortcuts import render_to_response
+from django.template import RequestContext
 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,13 +32,16 @@ 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={
+    return render_to_response('explorer/editor.html',
+        # mimetype="text/html",
+        dictionary = {
             'fileid': path,
-            'euser': user
-    })
-    
+            'euser': user,
+            'gallery_from': gallery_form,
+        }, context_instance=RequestContext(request))
+
 #
 # View all files
 #
@@ -53,7 +60,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 +116,18 @@ 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} )
+
+
+#
+# Testing
+#
+def renderer_test(request):
+    return direct_to_template(request, 'renderer.html', mimetype="application/xhtml+xml",
+        extra_context = {} )