from librarian import html
-import hg, urllib2
+import hg, urllib2, time
from django.utils import simplejson as json
from django.views.generic.simple import direct_to_template
from explorer import forms, models
-repo = hg.Repository(settings.REPOSITORY_PATH)
-
-def file_list(request):
+#
+# Some useful decorators
+#
+def with_repo(view):
+ """Open a repository for this view"""
+ def view_with_repo(request, *args, **kwargs):
+ kwargs['repo'] = hg.Repository(settings.REPOSITORY_PATH)
+ return view(request, *args, **kwargs)
+ return view_with_repo
+
+#
+def ajax_login_required(view):
+ """Similar ro @login_required, but instead of redirect,
+ just return some JSON stuff with error."""
+ def view_with_auth(request, *args, **kwargs):
+ if request.user.is_authenticated():
+ return view(request, *args, **kwargs)
+ # not authenticated
+ return HttpResponse( json.dumps({'result': 'access_denied'}) );
+ return view_with_auth
+
+#
+# View all files
+#
+
+@with_repo
+def file_list(request, repo):
return direct_to_template(request, 'explorer/file_list.html', extra_context={
'objects': repo.all_files(),
})
+#
+# Edit the file
+#
-def file_xml(request, path):
+@ajax_login_required
+@with_repo
+def file_xml(request, repo, path):
if request.method == 'POST':
form = forms.BookForm(request.POST)
if form.is_valid():
- # save the changes to a local branch
-# repo.write_lock()
- print request.user
-# repo.switch_to_branch(request.user.name)
-# repo.add_file(path, form.cleaned_data['text'])
-
- # add references to comment
- issues = _get_issues_for_file(path)
- commit_message = _add_references(form.cleaned_data['commit_message'], issues)
- print 'Commiting with: ' + commit_message
-
-# repo.commit(message=commit_message, user=form.cleaned_data['user'])
- return HttpResponse( json.dumps({'message': commit_message}) )
- else:
- form = forms.BookForm()
- form.fields['text'].initial = repo.get_file(path).data()
+ print 'Saving whole text.', request.user.username
+ def save_action():
+ print 'In branch: ' + repo.repo[None].branch()
+ print repo._add_file(path, form.cleaned_data['content'])
+ print repo.repo.status()
+ print repo._commit(message=(form.cleaned_data['commit_message'] or 'Lokalny zapis platformy.'), user=request.user.username)
+
+ print repo.in_branch(save_action, models.user_branch(request.user) );
+ result = "ok"
+ else:
+ result = "error"
+
+ errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() )
+ return HttpResponse( json.dumps({'result': result, 'errors': errors}) );
+
+ form = forms.BookForm()
+ data = repo.get_file(path, models.user_branch(request.user))
+ form.fields['content'].initial = data
+ return HttpResponse( json.dumps({'result': 'ok', 'content': data}) )
+
+@ajax_login_required
+@with_repo
+def file_dc(request, path, repo):
+ if request.method == 'POST':
+ form = forms.DublinCoreForm(request.POST)
+ if form.is_valid():
+ form.save(repo, path)
+ result = "ok"
+ else:
+ result = "error"
+
+ errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() )
+ return HttpResponse( json.dumps({'result': result, 'errors': errors}) );
- return direct_to_template(request, 'explorer/file_xml.html', extra_context={
- 'hash': path,
- 'form': form,
- 'image_folders_form': forms.ImageFoldersForm(),
- })
+ fulltext = repo.get_file(path, models.user_branch(request.user))
+ form = forms.DublinCoreForm(text=fulltext)
+ return HttpResponse( json.dumps({'result': 'ok', 'content': fulltext}) )
+# Display the main editor view
+
+@login_required
+def display_editor(request, path):
+ return direct_to_template(request, 'explorer/editor.html', extra_context={
+ 'hash': path, 'panel_list': ['lewy', 'prawy'],
+ })
# ===============
# = Panel views =
# ===============
-def xmleditor_panel(request, path):
+
+@ajax_login_required
+@with_repo
+def xmleditor_panel(request, path, repo):
form = forms.BookForm()
- text = repo.get_file(path).data()
+ text = repo.get_file(path, models.user_branch(request.user))
return direct_to_template(request, 'explorer/panels/xmleditor.html', extra_context={
+ 'fpath': path,
'text': text,
})
+@ajax_login_required
def gallery_panel(request, path):
return direct_to_template(request, 'explorer/panels/gallery.html', extra_context={
+ 'fpath': path,
'form': forms.ImageFoldersForm(),
})
-
-def htmleditor_panel(request, path):
+@ajax_login_required
+@with_repo
+def htmleditor_panel(request, path, repo):
+ user_branch = models.user_branch(request.user)
return direct_to_template(request, 'explorer/panels/htmleditor.html', extra_context={
- 'html': html.transform(repo.get_file(path).data(), is_file=False),
+ 'fpath': path,
+ 'html': html.transform(repo.get_file(path, user_branch), is_file=False),
})
+@ajax_login_required
+@with_repo
+def dceditor_panel(request, path, repo):
+ user_branch = models.user_branch(request.user)
+ text = repo.get_file(path, user_branch)
+ form = forms.DublinCoreForm(text=text)
+
+ return direct_to_template(request, 'explorer/panels/dceditor.html', extra_context={
+ 'fpath': path,
+ 'form': form,
+ })
+
+
+# =================
+# = Utility views =
+# =================
+@ajax_login_required
def folder_images(request, folder):
return direct_to_template(request, 'explorer/folder_images.html', extra_context={
'images': models.get_images_from_folder(folder),
})
+
def _add_references(message, issues):
return message + " - " + ", ".join(map(lambda issue: "Refs #%d" % issue['id'], issues))
return []
finally:
if uf: uf.close()
+
+
+# =================
+# = Pull requests =
+# =================
+def pull_requests(request):
+ return direct_to_template(request, 'manager/pull_request.html', extra_context = {
+ 'objects': models.PullRequest.objects.all()} )
fnp / redakcja.git / blobdiff