X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/2ca0264b141985f70fe1876b10fcb3539c598967..d13884c8db4b387b360189b5d97ca840bcbc4cd4:/apps/catalogue/views.py?ds=sidebyside

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 257d4727d..9ae50515d 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -30,7 +30,6 @@ class LazyEncoder(simplejson.JSONEncoder):
         return obj
 
 
-@cache.cache_control(must_revalidate=True, max_age=3600)
 def main_page(request):    
     if request.user.is_authenticated():
         shelves = models.Tag.objects.filter(category='set', user=request.user)
@@ -58,7 +57,6 @@ def book_list(request):
         context_instance=RequestContext(request))
 
 
-@cache.cache_control(must_revalidate=True, max_age=3600)
 def tagged_object_list(request, tags=''):
     # Prevent DoS attacks on our database
     if len(tags.split('/')) > 6:
@@ -70,16 +68,19 @@ def tagged_object_list(request, tags=''):
         raise Http404
     
     model = models.Book
+    shelf = [tag for tag in tags if tag.category == 'set']
     shelf_is_set = (len(tags) == 1 and tags[0].category == 'set')
     theme_is_set = len([tag for tag in tags if tag.category == 'theme']) > 0
     if theme_is_set:
         model = models.Fragment
 
+    user_is_owner = (len(shelf) and request.user.is_authenticated() and request.user == shelf[0].user)
+    
     extra_where = 'NOT catalogue_tag.category = "set"'
     related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)
 
-    if not theme_is_set:
+    if not (theme_is_set or shelf_is_set):
         model=models.Book.objects.filter(parent=None)
     
     return newtagging_views.tagged_object_list(
@@ -88,7 +89,7 @@ def tagged_object_list(request, tags=''):
         queryset_or_model=model,
         tags=tags,
         template_name='catalogue/tagged_object_list.html',
-        extra_context = {'categories': categories, 'shelf_is_set': shelf_is_set },
+        extra_context = {'categories': categories, 'shelf_is_set': shelf_is_set, 'user_is_owner': user_is_owner },
     )
 
 
@@ -175,7 +176,6 @@ def user_shelves(request):
     return render_to_response('catalogue/user_shelves.html', locals(),
             context_instance=RequestContext(request))
 
-
 @cache.never_cache
 def book_sets(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
@@ -202,6 +202,18 @@ def book_sets(request, slug):
         context_instance=RequestContext(request))
 
 
+@login_required
+@require_POST
+@cache.never_cache
+def remove_from_shelf(request, shelf, book):
+    book = get_object_or_404(models.Book, slug=book)
+    shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user)
+    
+    models.Tag.objects.remove_tag(book, shelf)
+    
+    return HttpResponse('Usunieto')
+
+
 @cache.never_cache
 def download_shelf(request, slug):
     """"
@@ -214,7 +226,18 @@ def download_shelf(request, slug):
     # Create a ZIP archive
     temp = temp = tempfile.TemporaryFile()
     archive = zipfile.ZipFile(temp, 'w')
-    for book in models.Book.tagged.with_all(shelf):
+    
+    # Collect all books to include in ZIP archive
+    def collect_books(books):
+        result = []
+        for book in books:
+            if len(book.children.all()) == 0:
+                result.append(book)
+            else:
+                result += collect_books(book.children.all())
+        return result
+    
+    for book in collect_books(models.Book.tagged.with_all(shelf)):
         if book.pdf_file:
             filename = book.pdf_file.path
             archive.write(filename, str('%s.pdf' % book.slug))
@@ -248,8 +271,7 @@ def new_set(request):
         else:
             return HttpResponseRedirect('/')
 
-    return render_to_response('catalogue/book_sets.html', locals(),
-            context_instance=RequestContext(request))
+    return HttpResponseRedirect('/')
 
 
 @login_required