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 fd99f27..a67d27c 100755 (executable)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -15,8 +15,10 @@ 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."""
@@ -30,15 +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 render_to_response('explorer/editor.html',
-        mimetype="text/html",
+        # mimetype="text/html",
         dictionary = {
             'fileid': path,
-            'euser': user
+            'euser': user,
+            'gallery_from': gallery_form,
         }, context_instance=RequestContext(request))
-    
+
 #
 # View all files
 #
@@ -127,4 +130,4 @@ def pull_requests(request):
 #
 def renderer_test(request):
     return direct_to_template(request, 'renderer.html', mimetype="application/xhtml+xml",
-        extra_context = {} )
\ No newline at end of file
+        extra_context = {} )