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
@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')
# 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 =