X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3517c7fa3ec165a2650799a8d821d21116789c3b..8494d84b0b2f8b87ebe6bd388dfb98a2780b12f3:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 5134eed5..61d9a235 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -1,11 +1,11 @@ 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 django.conf import settings -from django.http import HttpResponseRedirect +from django.http import HttpResponseRedirect, HttpResponse from django.contrib.auth.decorators import login_required from explorer import forms, models @@ -17,42 +17,107 @@ def file_list(request): 'objects': repo.all_files(), }) + +# +# Edit the file +# def file_xml(request, path): if request.method == 'POST': form = forms.BookForm(request.POST) if form.is_valid(): - 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 HttpResponseRedirect(request.get_full_path()) + print 'Saving whole text.', request.user.username + def save_action(): + repo.add_file(path, form.cleaned_data['content']) + repo.commit(message='Local save at %s' % time.ctime(), user=request.user.username) + + repo.in_branch('local_'+request.user.username, save_action); + 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}) ); else: form = forms.BookForm() - form.fields['text'].initial = repo.get_file(path).data() - - return direct_to_template(request, 'explorer/file_xml.html', extra_context={ - 'hash': path, + form.fields['content'].initial = repo.get_file(path).data() + + return direct_to_template(request, 'explorer/edit_text.html', extra_context={ 'form': form, - 'image_folders_form': forms.ImageFoldersForm(), }) +def file_dc(request, path): + if request.method == 'POST': + form = forms.DublinCoreForm(request.POST) + if form.is_valid(): + form.save(repo, path) + result = "ok" + else: + result = "error" -def file_html(request, path): - return direct_to_template(request, 'explorer/file_html.html', extra_context={ - 'object': html.transform(repo.get_file(path).data(), is_file=False), + errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() ) + return HttpResponse( json.dumps({'result': result, 'errors': errors}) ); + else: + fulltext = repo.get_file(path).data() + form = forms.DublinCoreForm(text=fulltext) + + return direct_to_template(request, 'explorer/edit_dc.html', extra_context={ + 'form': form, + 'fpath': path, + }) + +# Display the main editor view +def display_editor(request, path): + return direct_to_template(request, 'explorer/editor.html', extra_context={ 'hash': path, - 'image_folders_form': forms.ImageFoldersForm(), }) - + +# =============== +# = Panel views = +# =============== + +def xmleditor_panel(request, path): + form = forms.BookForm() + text = repo.get_file(path).data() + + return direct_to_template(request, 'explorer/panels/xmleditor.html', extra_context={ + 'fpath': path, + 'text': text, + }) + + +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): + return direct_to_template(request, 'explorer/panels/htmleditor.html', extra_context={ + 'fpath': path, + 'html': html.transform(repo.get_file(path).data(), is_file=False), + }) + + +def dceditor_panel(request, path): + text = repo.get_file(path).data() + form = forms.DublinCoreForm(text=text) + + return direct_to_template(request, 'explorer/panels/dceditor.html', extra_context={ + 'fpath': path, + 'form': form, + }) + + +# ================= +# = Utility views = +# ================= 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))