Poprawienie funkcji elementType.

[redakcja.git] / apps / wiki / views.py

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 339bde8..ec43dee 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -1,5 +1,9 @@
+import os
+
+from django.conf import settings

 from django.views.generic.simple import direct_to_template
 from django.views.generic.simple import direct_to_template

-from django.http import HttpResponseRedirect
+from django.http import HttpResponse, Http404
+from django.utils import simplejson as json

 
 from wiki.models import storage, Document, DocumentNotFound
 from wiki.forms import DocumentForm
 
 from wiki.models import storage, Document, DocumentNotFound
 from wiki.forms import DocumentForm


@@ -16,12 +20,15 @@ def document_detail(request, name, template_name='wiki/document_details.html'):
         document = storage.get(name)
     except DocumentNotFound:
         document = Document(storage, name=name, text='')
         document = storage.get(name)
     except DocumentNotFound:
         document = Document(storage, name=name, text='')

-        
+    
+

     if request.method == 'POST':
         form = DocumentForm(request.POST, instance=document)
         if form.is_valid():
     if request.method == 'POST':
         form = DocumentForm(request.POST, instance=document)
         if form.is_valid():

-            form.save()
-            return HttpResponseRedirect('/')
+            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)
     
     else:
         form = DocumentForm(instance=document)
     


@@ -29,3 +36,13 @@ def document_detail(request, name, template_name='wiki/document_details.html'):
         'document': document,
         'form': form,
     })
         '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