display fix

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index a44c7e8..ef042de 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -7,10 +7,10 @@ from django.contrib import auth
 from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse

-from django.db.models import Count
+from django.db.models import Count, Q

 from django import http
 from django.http import Http404
 from django import http
 from django.http import Http404

-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, render

 from django.utils.http import urlquote_plus
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.http import require_POST
 from django.utils.http import urlquote_plus
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.http import require_POST


@@ -19,11 +19,10 @@ from django.views.generic.simple import direct_to_template
 import librarian.html
 import librarian.text
 
 import librarian.html
 import librarian.text
 

-from apiclient import api_call

 from catalogue import forms
 from catalogue import helpers
 from catalogue.helpers import active_tab
 from catalogue import forms
 from catalogue import helpers
 from catalogue.helpers import active_tab

-from catalogue.models import Book, Chunk
+from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord

 from catalogue import xml_tools
 
 #
 from catalogue import xml_tools
 
 #


@@ -37,49 +36,23 @@ logger = logging.getLogger("fnp.catalogue")
 @active_tab('all')
 @never_cache
 def document_list(request):
 @active_tab('all')
 @never_cache
 def document_list(request):

-    chunks_list = helpers.ChunksList(Chunk.objects.order_by(
-        'book__title', 'book', 'number'))
+    return render(request, 'catalogue/document_list.html')

 
 

-    return direct_to_template(request, 'catalogue/document_list.html', extra_context={
-        'books': chunks_list,
-        #'books': [helpers.BookChunks(b) for b in Book.objects.all().select_related()],
-        'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
-                        key=lambda x: x[1]['time'], reverse=True),
-    })

 
 

-
-@active_tab('unassigned')

 @never_cache
 @never_cache

-def unassigned(request):
-    chunks_list = helpers.ChunksList(Chunk.objects.filter(
-        user=None).order_by('book__title', 'book__id', 'number'))
-
-    return direct_to_template(request, 'catalogue/document_list.html', extra_context={
-        'books': chunks_list,
-        'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
-                        key=lambda x: x[1]['time'], reverse=True),
-    })
+def user(request, username):
+    user = get_object_or_404(User, username=username)
+    return render(request, 'catalogue/user_page.html', {"viewed_user": user})

 
 
 
 

+@login_required
+@active_tab('my')

 @never_cache
 @never_cache

-def user(request, username=None):
-    if username is None:
-        if request.user.is_authenticated():
-            user = request.user
-        else:
-            raise Http404
-    else:
-        user = get_object_or_404(User, username=username)
-
-    chunks_list = helpers.ChunksList(Chunk.objects.filter(
-        user=user).order_by('book__title', 'book', 'number'))
-
-    return direct_to_template(request, 'catalogue/document_list.html', extra_context={
-        'books': chunks_list,
+def my(request):
+    return render(request, 'catalogue/my_page.html', {

         'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
                         key=lambda x: x[1]['time'], reverse=True),
         'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
                         key=lambda x: x[1]['time'], reverse=True),

-    })
-my = login_required(active_tab('my')(user))
+        })

 
 
 @active_tab('users')
 
 
 @active_tab('users')


@@ -90,6 +63,11 @@ def users(request):
     })
 
 
     })
 
 

+@active_tab('activity')
+def activity(request):
+    return render(request, 'catalogue/activity.html')
+
+

 @never_cache
 def logout_then_redirect(request):
     auth.logout(request)
 @never_cache
 def logout_then_redirect(request):
     auth.logout(request)


@@ -110,10 +88,11 @@ def create_missing(request, slug=None):
                 creator = request.user
             else:
                 creator = None
                 creator = request.user
             else:
                 creator = None

-            book = Book.create(creator=creator,
+            book = Book.create(
+                text=form.cleaned_data['text'],
+                creator=creator,

                 slug=form.cleaned_data['slug'],
                 title=form.cleaned_data['title'],
                 slug=form.cleaned_data['slug'],
                 title=form.cleaned_data['title'],

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

             )
 
             return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug]))
             )
 
             return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug]))


@@ -168,10 +147,11 @@ def upload(request):
 
             if not error_list:
                 for filename, slug, title in ok_list:
 
             if not error_list:
                 for filename, slug, title in ok_list:

-                    Book.create(creator=creator,
+                    book = Book.create(
+                        text=zip.read(filename).decode('utf-8'),
+                        creator=creator,

                         slug=slug,
                         title=title,
                         slug=slug,
                         title=title,

-                        text=zip.read(filename).decode('utf-8'),

                     )
 
             return direct_to_template(request, "catalogue/document_upload.html", extra_context={
                     )
 
             return direct_to_template(request, "catalogue/document_upload.html", extra_context={


@@ -339,14 +319,14 @@ def chunk_add(request, slug, chunk):
                 creator = None
             doc.split(creator=creator,
                 slug=form.cleaned_data['slug'],
                 creator = None
             doc.split(creator=creator,
                 slug=form.cleaned_data['slug'],

-                comment=form.cleaned_data['comment'],
+                title=form.cleaned_data['title'],

             )
 
             return http.HttpResponseRedirect(doc.book.get_absolute_url())
     else:
         form = forms.ChunkAddForm(initial={
                 "slug": str(doc.number + 1),
             )
 
             return http.HttpResponseRedirect(doc.book.get_absolute_url())
     else:
         form = forms.ChunkAddForm(initial={
                 "slug": str(doc.number + 1),

-                "comment": "cz. %d" % (doc.number + 1, ),
+                "title": "cz. %d" % (doc.number + 1, ),

         })
 
     return direct_to_template(request, "catalogue/chunk_add.html", extra_context={
         })
 
     return direct_to_template(request, "catalogue/chunk_add.html", extra_context={


@@ -409,10 +389,8 @@ def book_edit(request, slug):
 def publish(request, slug):
     book = get_object_or_404(Book, slug=slug)
     try:
 def publish(request, slug):
     book = get_object_or_404(Book, slug=slug)
     try:

-        ret = api_call(request.user, "books", {"book_xml": book.materialize()})
+        book.publish(request.user)

     except BaseException, e:
         return http.HttpResponse(e)
     else:
     except BaseException, e:
         return http.HttpResponse(e)
     else:

-        book.last_published = datetime.now()
-        book.save()

         return http.HttpResponseRedirect(book.get_absolute_url())
         return http.HttpResponseRedirect(book.get_absolute_url())