Added extra_info field to Book model.

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index b73552e..f284e0a 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -30,7 +30,6 @@ class LazyEncoder(simplejson.JSONEncoder):
         return obj
 
 
         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)
 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))
 
 
         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:
 def tagged_object_list(request, tags=''):
     # Prevent DoS attacks on our database
     if len(tags.split('/')) > 6:


@@ -70,11 +68,14 @@ def tagged_object_list(request, tags=''):
         raise Http404
     
     model = models.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')
     theme_is_set = len([tag for tag in tags if tag.category == 'theme']) > 0
     if theme_is_set:
         model = models.Fragment
 
     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)
     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)


@@ -88,7 +89,7 @@ def tagged_object_list(request, tags=''):
         queryset_or_model=model,
         tags=tags,
         template_name='catalogue/tagged_object_list.html',
         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 },

     )
 
 
     )
 
 


@@ -156,7 +157,7 @@ def search(request):
 
 
 def tags_starting_with(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('')
     # Prefix must have at least 2 characters
     if len(prefix) < 2:
         return HttpResponse('')


@@ -175,7 +176,6 @@ def user_shelves(request):
     return render_to_response('catalogue/user_shelves.html', locals(),
             context_instance=RequestContext(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)
 @cache.never_cache
 def book_sets(request, slug):
     book = get_object_or_404(models.Book, slug=slug)


@@ -188,8 +188,18 @@ def book_sets(request, slug):
     if request.method == 'POST':
         form = forms.ObjectSetsForm(book, request.user, request.POST)
         if form.is_valid():
     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:
             if request.is_ajax():
                 return HttpResponse('<p>Półki zostały zapisane.</p>')
             else:


@@ -202,6 +212,21 @@ def book_sets(request, slug):
         context_instance=RequestContext(request))
 
 
         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)
+    
+    shelf.book_count -= 1
+    shelf.save()
+    
+    return HttpResponse('Usunieto')
+
+

 @cache.never_cache
 def download_shelf(request, slug):
     """"
 @cache.never_cache
 def download_shelf(request, slug):
     """"


@@ -259,8 +284,7 @@ def new_set(request):
         else:
             return HttpResponseRedirect('/')
 
         else:
             return HttpResponseRedirect('/')
 

-    return render_to_response('catalogue/book_sets.html', locals(),
-            context_instance=RequestContext(request))
+    return HttpResponseRedirect('/')

 
 
 @login_required
 
 
 @login_required