X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f734261e68dc171da98aabe700e170c3ede3b6a5..fbe38cbbacc776e1533f9adc51f5621d5b8ea77f:/apps/wiki/views.py?ds=sidebyside diff --git a/apps/wiki/views.py b/apps/wiki/views.py index b242802b..ec43deea 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,5 +1,8 @@ +import os + +from django.conf import settings from django.views.generic.simple import direct_to_template -from django.http import HttpResponse +from django.http import HttpResponse, Http404 from django.utils import simplejson as json from wiki.models import storage, Document, DocumentNotFound @@ -23,7 +26,7 @@ def document_detail(request, name, template_name='wiki/document_details.html'): form = DocumentForm(request.POST, instance=document) if form.is_valid(): document = form.save() - return HttpResponse(json.dumps({'text': document.text, 'revision': document.revision()})) + return HttpResponse(json.dumps({'text': document.plain_text(), 'meta': document.meta(), 'revision': document.revision()})) else: return HttpResponse(json.dumps({'errors': form.errors})) else: @@ -33,3 +36,13 @@ def document_detail(request, name, template_name='wiki/document_details.html'): 'document': document, 'form': form, }) + + +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: + raise Http404