Fragments.

[wolnelektury.git] / catalogue / views.py

diff --git a/catalogue/views.py b/catalogue/views.py
index 0166133..0d174ce 100644 (file)
--- a/catalogue/views.py
+++ b/catalogue/views.py
@@ -36,9 +36,9 @@ def search(request):
         tag_list = models.Tag.get_tag_list(tags)
         tag = models.Tag.objects.get(name=query)
     except models.Tag.DoesNotExist:
         tag_list = models.Tag.get_tag_list(tags)
         tag = models.Tag.objects.get(name=query)
     except models.Tag.DoesNotExist:

-        print "%r, %r" % (query, tags)

         try:
             book = models.Book.objects.get(title=query)
         try:
             book = models.Book.objects.get(title=query)

+            return HttpResponseRedirect(book.get_absolute_url())

         except models.Book.DoesNotExist:
             return HttpResponseRedirect(reverse('catalogue.views.main_page'))
     else:
         except models.Book.DoesNotExist:
             return HttpResponseRedirect(reverse('catalogue.views.main_page'))
     else:


@@ -75,6 +75,8 @@ def main_page(request):
     else:
         extra_where = 'NOT catalogue_tag.category = "set"'
     tags = models.Tag.objects.usage_for_model(models.Book, counts=True, extra={'where': [extra_where]})
     else:
         extra_where = 'NOT catalogue_tag.category = "set"'
     tags = models.Tag.objects.usage_for_model(models.Book, counts=True, extra={'where': [extra_where]})

+    fragment_tags = models.Tag.objects.usage_for_model(models.Fragment, counts=True,
+        extra={'where': ['catalogue_tag.category = "theme"']})

     categories = split_tags(tags)
     
     form = forms.SearchForm()
     categories = split_tags(tags)
     
     form = forms.SearchForm()


@@ -99,18 +101,23 @@ def tagged_book_list(request, tags=''):
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:
         raise Http404
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:
         raise Http404

-        
+    
+    model = models.Book
+    theme_is_set = any(tag.category == 'theme' for tag in tags)
+    if theme_is_set:
+        model = models.Fragment
+    

     if request.user.is_authenticated():
         extra_where = '(NOT catalogue_tag.category = "set" OR catalogue_tag.user_id = %d)' % request.user.id
     else:
         extra_where = 'NOT catalogue_tag.category = "set"'
     if request.user.is_authenticated():
         extra_where = '(NOT catalogue_tag.category = "set" OR catalogue_tag.user_id = %d)' % request.user.id
     else:
         extra_where = 'NOT catalogue_tag.category = "set"'

-    related_tags = models.Tag.objects.related_for_model(tags, models.Book, counts=True, extra={'where': [extra_where]})
+    related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]})

     categories = split_tags(related_tags)
 
     return tagged_object_list(
         request,
         tag_model=models.Tag,
     categories = split_tags(related_tags)
 
     return tagged_object_list(
         request,
         tag_model=models.Tag,

-        queryset_or_model=models.Book,
+        queryset_or_model=model,

         tags=tags,
         template_name='catalogue/tagged_book_list.html',
         extra_context = {'categories': categories },
         tags=tags,
         template_name='catalogue/tagged_book_list.html',
         extra_context = {'categories': categories },