X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/317112df0a3aa6652f867da0fd8b7de504156e2b..3e1aff21cb6131f52bc4ef17187af665b31654a8:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index ec43deea..f9e69962 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -8,31 +8,30 @@ from django.utils import simplejson as json from wiki.models import storage, Document, DocumentNotFound from wiki.forms import DocumentForm - -def document_list(request, template_name='wiki/document_list.html'): - return direct_to_template(request, template_name, extra_context={ +def document_list(request, template_name = 'wiki/document_list.html'): + return direct_to_template(request, template_name, extra_context = { 'document_list': storage.all(), }) -def document_detail(request, name, template_name='wiki/document_details.html'): +def document_detail(request, name, template_name = 'wiki/document_details.html'): try: document = storage.get(name) except DocumentNotFound: - document = Document(storage, name=name, text='') - + document = Document(storage, name = name, text = '') + if request.method == 'POST': - form = DocumentForm(request.POST, instance=document) + form = DocumentForm(request.POST, instance = document) if form.is_valid(): document = form.save() return HttpResponse(json.dumps({'text': document.plain_text(), 'meta': document.meta(), 'revision': document.revision()})) else: return HttpResponse(json.dumps({'errors': form.errors})) else: - form = DocumentForm(instance=document) - - return direct_to_template(request, template_name, extra_context={ + form = DocumentForm(instance = document) + + return direct_to_template(request, template_name, extra_context = { 'document': document, 'form': form, }) @@ -41,7 +40,6 @@ def document_detail(request, name, template_name='wiki/document_details.html'): def document_gallery(request, directory): try: base_dir = os.path.join(settings.MEDIA_ROOT, settings.FILEBROWSER_DIRECTORY, directory) - print base_dir images = ['%s%s%s/%s' % (settings.MEDIA_URL, settings.FILEBROWSER_DIRECTORY, directory, f) for f in os.listdir(base_dir) if os.path.splitext(f)[1].lower() in ('.jpg', '.jpeg', '.png')] return HttpResponse(json.dumps(images)) except (IndexError, OSError), e: