X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/15f3b1ec20246e7935176a743cc95b4863e6ce24..c51a084ecf2fefb54ef9f74b21beff437ac9a4bb:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py index e3ca63a7..23b70592 100644 --- 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): - 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 @@ -59,9 +59,16 @@ def ajax_login_required(view): @with_repo def file_list(request, repo): import api.forms + from api.resources import library_resource + 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={ - 'files': repo.documents(), 'bookform': bookform, + 'filetree': doctree['documents'], 'bookform': bookform, }) @permission_required('explorer.can_add_files') @@ -348,27 +355,26 @@ def file_dc(request, path, repo): # Display the main editor view @login_required -@with_repo -def display_editor(request, path, repo): - +# @with_repo +def display_editor(request, path): # this is the only entry point where we create an autobranch for the user # if it doesn't exists. All other views SHOULD fail. - def ensure_branch_exists(): - parent = repo.get_branch_tip('default') - repo._create_branch(file_branch(path, request.user), parent) + #def ensure_branch_exists(): + # parent = repo.get_branch_tip('default') + # repo._create_branch(file_branch(path, request.user), parent) - try: - repo.with_wlock(ensure_branch_exists) +# try: + # repo.with_wlock(ensure_branch_exists) - return direct_to_template(request, 'explorer/editor.html', extra_context={ - 'fileid': path, - 'panel_list': ['lewy', 'prawy'], - 'availble_panels': models.EditorPanel.objects.all(), - 'scriptlets': toolbar_models.Scriptlet.objects.all() - }) - except KeyError: - return direct_to_template(request, 'explorer/nofile.html', \ - extra_context = { 'fileid': path }) + return direct_to_template(request, 'explorer/editor.html', extra_context={ + 'fileid': path, + 'panel_list': ['lewy', 'prawy'], + 'availble_panels': models.EditorPanel.objects.all(), + # 'scriptlets': toolbar_models.Scriptlet.objects.all() + }) +# except KeyError: +# return direct_to_template(request, 'explorer/nofile.html', \ +# extra_context = { 'fileid': path }) # =============== # = Panel views =