X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/563c8930b3b5643399dc409f6ed139f7289b6ea7..6e769eb123cc216e4ba642d3a6d943dfd3fa0abe:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 7f866a35..150b03d1 100755 --- 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 api.models import PullRequest +# from api.models import PullRequest from bookthemes.models import Theme def ajax_login_required(view): @@ -39,7 +39,7 @@ def display_editor(request, path): dictionary = { 'fileid': path, 'euser': user, - 'gallery_from': gallery_form, + '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)) @@ -47,18 +47,17 @@ def display_editor(request, path): # 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 - doctree = library_resource.handler.read(request) + # doctree = library_resource.handler.read(request) # 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):