Dodanie funkcji do ulepszonej serializacji XMLa.

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

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 76670f5..150b03d 100755 (executable)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -16,7 +16,7 @@ from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 
 from explorer import forms
 from django.contrib.auth.decorators import login_required
 
 from explorer import forms

-from api.models import PullRequest
+# from api.models import PullRequest

 from bookthemes.models import Theme
 
 def ajax_login_required(view):
 from bookthemes.models import Theme
 
 def ajax_login_required(view):


@@ -39,26 +39,25 @@ def display_editor(request, path):
         dictionary = {
             'fileid': path,
             'euser': user,
         dictionary = {
             'fileid': path,
             'euser': user,

-            'gallery_from': gallery_form,
-            'availble_themes': ({'first_letter': t.name[0].upper(), 'name': t.name} for t in Theme.objects.order_by('name')),
+            'gallery_form': gallery_form,
+            'available_themes': ({'first_letter': t.name[0].upper(), 'name': t.name} for t in Theme.objects.order_by('name')),

         }, context_instance=RequestContext(request))
 
 #
 # View all files
 #
 def file_list(request):   
         }, context_instance=RequestContext(request))
 
 #
 # View all files
 #
 def file_list(request):   

-    import api.forms
-    from api.resources import library_resource
-
-    bookform = api.forms.DocumentUploadForm()
+    from wiki.views import document_list

 
     # short-circut the api document list
 
     # short-circut the api document list

-    doctree = library_resource.handler.read(request)
+    # doctree = library_resource.handler.read(request)

     # print "DOCTREE:", doctree['documents']
         
     # print "DOCTREE:", doctree['documents']
         

-    return direct_to_template(request, 'explorer/file_list.html', extra_context={
-        'filetree': doctree['documents'], 'bookform': bookform,
-    })
+    return document_list(request, 'explorer/file_list.html')
+    
+    # return direct_to_template(request, 'explorer/file_list.html', extra_context={
+    #     'files': files, 'bookform': bookform,
+    # })

 
 @permission_required('api.document.can_add')
 def file_upload(request):
 
 @permission_required('api.document.can_add')
 def file_upload(request):


@@ -130,5 +129,5 @@ def pull_requests(request):
 # Testing
 #
 def renderer_test(request):
 # Testing
 #
 def renderer_test(request):

-    return direct_to_template(request, 'renderer.html', mimetype="application/xhtml+xml",
+    return direct_to_template(request, 'renderer.html', mimetype="text/html",

         extra_context = {} )
         extra_context = {} )