X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/fdd62169ba22c4c1be2f2306b5339eadd74ffb6d..4ac9918f152cc49badd4a359bfed41e723161cdf:/apps/catalogue/views.py?ds=inline

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 3c58f3f0..ef042de2 100644
--- 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.db.models import Count
+from django.db.models import Count, Q
 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
@@ -33,59 +33,26 @@ from django.views.decorators.cache import never_cache
 logger = logging.getLogger("fnp.catalogue")
 
 
-def slug_filter(qs, value, filter_field, model, model_field='slug', unset=''):
-    if value == unset:
-        return qs.filter(**{filter_field: None})
-    if value is None:
-        return qs
-    try:
-        obj = model._default_manager.get(**{model_field: value})
-    except model.DoesNotExist:
-        return qs.none()
-    else:
-        return qs.filter(**{filter_field: obj})
-
-
 @active_tab('all')
 @never_cache
-def document_list(request, filters=None):
-    chunks = Chunk.objects.order_by('book__title', 'book', 'number')
-
-    chunks = slug_filter(chunks, request.GET.get('user', None), 'user', User, 'username')
-    chunks = slug_filter(chunks, request.GET.get('stage', None), 'stage', Chunk.tag_model, 'slug')
-
-    chunks_list = helpers.ChunksList(chunks)
-
-    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),
-        'stages': Chunk.tag_model.objects.all(),
-        'users': User.objects.annotate(count=Count('chunk')).order_by('-count', 'last_name', 'first_name'),
-    })
+def document_list(request):
+    return render(request, 'catalogue/document_list.html')
 
 
 @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)
+def user(request, username):
+    user = get_object_or_404(User, username=username)
+    return render(request, 'catalogue/user_page.html', {"viewed_user": user})
 
-    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,
+@login_required
+@active_tab('my')
+@never_cache
+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),
-        'viewed_user': user,
-        'stages': Chunk.tag_model.objects.all(),
-    })
-my = login_required(active_tab('my')(user))
+        })
 
 
 @active_tab('users')
@@ -96,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)
@@ -116,10 +88,11 @@ def create_missing(request, slug=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'],
-                text=form.cleaned_data['text'],
             )
 
             return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug]))
@@ -174,10 +147,11 @@ def upload(request):
 
             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,
-                        text=zip.read(filename).decode('utf-8'),
                     )
 
             return direct_to_template(request, "catalogue/document_upload.html", extra_context={
@@ -345,14 +319,14 @@ def chunk_add(request, slug, chunk):
                 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),
-                "comment": "cz. %d" % (doc.number + 1, ),
+                "title": "cz. %d" % (doc.number + 1, ),
         })
 
     return direct_to_template(request, "catalogue/chunk_add.html", extra_context={