Add annotation - fix

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

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 48e05c5..4348cb8 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -13,10 +13,12 @@ from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError,
 from django import http
 
 from wiki.models import getstorage, DocumentNotFound, normalize_name, split_name, join_name, Theme
 from django import http
 
 from wiki.models import getstorage, DocumentNotFound, normalize_name, split_name, join_name, Theme

-from wiki.forms import DocumentTextSaveForm, DocumentTagForm, DocumentCreateForm
+from wiki.forms import DocumentTextSaveForm, DocumentTagForm, DocumentCreateForm, DocumentsUploadForm

 from datetime import datetime
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _
 from datetime import datetime
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _

+from django.utils.decorators import decorator_from_middleware
+from django.middleware.gzip import GZipMiddleware

 
 
 #
 
 
 #


@@ -126,11 +128,11 @@ def create_missing(request, name):
         form = DocumentCreateForm(request.POST, request.FILES)
         if form.is_valid():
             doc = storage.create_document(
         form = DocumentCreateForm(request.POST, request.FILES)
         if form.is_valid():
             doc = storage.create_document(

-                id=form.cleaned_data['id'],
+                name=form.cleaned_data['id'],

                 text=form.cleaned_data['text'],
             )
 
                 text=form.cleaned_data['text'],
             )
 

-            return http.HttpResponseRedirect(reverse("wiki_details", args=[doc.name]))
+            return http.HttpResponseRedirect(reverse("wiki_editor", args=[doc.name]))

     else:
         form = DocumentCreateForm(initial={
                 "id": name.replace(" ", "_"),
     else:
         form = DocumentCreateForm(initial={
                 "id": name.replace(" ", "_"),


@@ -143,8 +145,66 @@ def create_missing(request, name):
     })
 
 
     })
 
 

+def upload(request):
+    storage = getstorage()
+
+    if request.method == "POST":
+        form = DocumentsUploadForm(request.POST, request.FILES)
+        if form.is_valid():
+            zip = form.cleaned_data['zip']
+            skipped_list = []
+            ok_list = []
+            error_list = []
+            titles = {}
+            existing = storage.all()
+            for filename in zip.namelist():
+                if filename[-1] == '/':
+                    continue
+                title = normalize_name(os.path.basename(filename)[:-4])
+                if not (title and filename.endswith('.xml')):
+                    skipped_list.append(filename)
+                elif title in titles:
+                    error_list.append((filename, title, _('Title already used for %s' % titles[title])))
+                elif title in existing:
+                    error_list.append((filename, title, _('Title already used in repository.')))
+                else:
+                    try:
+                        zip.read(filename).decode('utf-8') # test read
+                        ok_list.append((filename, title))
+                    except UnicodeDecodeError:
+                        error_list.append((filename, title, _('File should be UTF-8 encoded.')))
+                    titles[title] = filename
+
+            if not error_list:
+                for filename, title in ok_list:
+                    storage.create_document(
+                        name=title,
+                        text=zip.read(filename).decode('utf-8')
+                    )
+
+            return direct_to_template(request, "wiki/document_upload.html", extra_context={
+                "form": form,
+                "ok_list": ok_list,
+                "skipped_list": skipped_list,
+                "error_list": error_list,
+            })
+                #doc = storage.create_document(
+                #    name=base,
+                #    text=form.cleaned_data['text'],
+
+            
+            return http.HttpResponse('\n'.join(yeslist) + '\n\n' + '\n'.join(nolist))
+    else:
+        form = DocumentsUploadForm()
+
+    return direct_to_template(request, "wiki/document_upload.html", extra_context={
+        "form": form,
+    })
+
+

 @never_cache
 @normalized_name
 @never_cache
 @normalized_name

+@decorator_from_middleware(GZipMiddleware)

 def text(request, name):
     storage = getstorage()
 
 def text(request, name):
     storage = getstorage()
 


@@ -157,7 +217,13 @@ def text(request, name):
             comment = form.cleaned_data['comment']
             if form.cleaned_data['stage_completed']:        
                 comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed']         
             comment = form.cleaned_data['comment']
             if form.cleaned_data['stage_completed']:        
                 comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed']         

-            author = "%s <%s>" % (form.cleaned_data['author_name'], form.cleaned_data['author_email'])           
+            if request.user.is_authenticated():
+                author_name = request.user
+                author_email = request.user.email
+            else:
+                author_name = form.cleaned_data['author_name']
+                author_email = form.cleaned_data['author_email']
+            author = "%s <%s>" % (author_name, author_email)

             storage.put(document, author=author, comment=comment, parent=revision)           
             document = storage.get(name)          
             return JSONResponse({
             storage.put(document, author=author, comment=comment, parent=revision)           
             document = storage.get(name)          
             return JSONResponse({