X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5c05e41cfb2907f6621833a8f673d66bfcac2699..54a73bdf072d5e31138f7e7181c0819c146f7a0c:/apps/catalogue/views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 7168fb05d..1718d9765 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -67,6 +67,9 @@ def tagged_object_list(request, tags=''):
     except models.Tag.DoesNotExist:
         raise Http404
     
+    if len([tag for tag in tags if tag.category == 'book']):
+        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')
@@ -76,7 +79,7 @@ def tagged_object_list(request, tags=''):
 
     user_is_owner = (len(shelf) and request.user.is_authenticated() and request.user == shelf[0].user)
     
-    extra_where = 'NOT catalogue_tag.category = "set"'
+    extra_where = 'catalogue_tag.category NOT IN ("set", "book")'
     related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)
 
@@ -93,11 +96,25 @@ def tagged_object_list(request, tags=''):
     )
 
 
+def book_fragments(request, book_slug, theme_slug):
+    book = get_object_or_404(models.Book, slug=book_slug)
+    book_tag = get_object_or_404(models.Tag, slug='l-' + book_slug)
+    theme = get_object_or_404(models.Tag, slug=theme_slug)
+    fragments = models.Fragment.tagged.with_all([book_tag, theme])
+    
+    form = forms.SearchForm()
+    return render_to_response('catalogue/book_fragments.html', locals(),
+        context_instance=RequestContext(request))
+
+
 def book_detail(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
+    book_tag = get_object_or_404(models.Tag, slug = 'l-' + slug)
     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)
     book_children = book.children.all().order_by('parent_number')
+    extra_where = 'catalogue_tag.category = "theme"'
+    book_themes = models.Tag.objects.related_for_model(book_tag, models.Fragment, counts=True, extra={'where': [extra_where]})
     
     form = forms.SearchForm()
     return render_to_response('catalogue/book_detail.html', locals(),
@@ -124,9 +141,9 @@ def _tags_starting_with(prefix, user):
     books = models.Book.objects.filter(title__icontains=prefix)
     tags = models.Tag.objects.filter(name__icontains=prefix)
     if user.is_authenticated():
-        tags = tags.filter(~Q(category='set') | Q(user=user))
+        tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user)))
     else:
-        tags = tags.filter(~Q(category='set'))
+        tags = tags.filter(~Q(category='book') & ~Q(category='set'))
 
     return list(books) + list(tags)
         
@@ -157,7 +174,7 @@ def search(request):
 
 
 def tags_starting_with(request):
-    prefix = request.GET['q']
+    prefix = request.GET.get('q', '')
     # Prefix must have at least 2 characters
     if len(prefix) < 2:
         return HttpResponse('')
@@ -176,7 +193,6 @@ def user_shelves(request):
     return render_to_response('catalogue/user_shelves.html', locals(),
             context_instance=RequestContext(request))
 
-@login_required
 @cache.never_cache
 def book_sets(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
@@ -189,8 +205,18 @@ def book_sets(request, slug):
     if request.method == 'POST':
         form = forms.ObjectSetsForm(book, request.user, request.POST)
         if form.is_valid():
-            book.tags = ([models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']] +
-                list(book.tags.filter(~Q(category='set') | ~Q(user=request.user))))
+            old_shelves = list(book.tags.filter(category='set'))
+            new_shelves = [models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']]
+            
+            for shelf in [shelf for shelf in old_shelves if shelf not in new_shelves]:
+                shelf.book_count -= 1
+                shelf.save()
+                
+            for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]:
+                shelf.book_count += 1
+                shelf.save()
+            
+            book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))
             if request.is_ajax():
                 return HttpResponse('<p>Półki zostały zapisane.</p>')
             else:
@@ -212,6 +238,9 @@ def remove_from_shelf(request, shelf, book):
     
     models.Tag.objects.remove_tag(book, shelf)
     
+    shelf.book_count -= 1
+    shelf.save()
+    
     return HttpResponse('Usunieto')
 
 
@@ -272,8 +301,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