Merge branch 'master' of stigma:platforma

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

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index c10e33b..23b7059 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -38,7 +38,7 @@ def file_path(fileid):
 def with_repo(view):
     """Open a repository for this view"""
     def view_with_repo(request, *args, **kwargs):          
 def with_repo(view):
     """Open a repository for this view"""
     def view_with_repo(request, *args, **kwargs):          

-        kwargs['repo'] = wlrepo.MercurialLibrary(settings.REPOSITORY_PATH)
+        kwargs['repo'] = wlrepo.open_library(settings.REPOSITORY_PATH, 'hg')

         return view(request, *args, **kwargs)
     return view_with_repo
 
         return view(request, *args, **kwargs)
     return view_with_repo
 


@@ -59,9 +59,16 @@ def ajax_login_required(view):
 @with_repo
 def file_list(request, repo):   
     import api.forms
 @with_repo
 def file_list(request, repo):   
     import api.forms

+    from api.resources import library_resource
+

     bookform = api.forms.DocumentUploadForm()
     bookform = api.forms.DocumentUploadForm()

+
+    # short-circut the api document list
+    doctree = library_resource.handler.read(request)
+    print "DOCTREE:", doctree['documents']
+        

     return direct_to_template(request, 'explorer/file_list.html', extra_context={
     return direct_to_template(request, 'explorer/file_list.html', extra_context={

-        'files': repo.documents(), 'bookform': bookform,
+        'filetree': doctree['documents'], 'bookform': bookform,

     })
 
 @permission_required('explorer.can_add_files')
     })
 
 @permission_required('explorer.can_add_files')