X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/108c9cc4636b04f4ba3f0edd67c26acbdca36984..88eaa6c36bd8a5eb8fe1a1b3ad1f8aaddb258d5c:/apps/catalogue/views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 3b9f31d16..56df88f99 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -73,16 +73,13 @@ def main_page(request):
     if request.user.is_authenticated():
         shelves = models.Tag.objects.filter(category='set', user=request.user)
         new_set_form = forms.NewSetForm()
-        extra_where = '((NOT catalogue_tag.category = "set" AND catalogue_tag.main_page = 1) OR catalogue_tag.user_id = %d)' % request.user.id
-    else:
-        extra_where = 'NOT catalogue_tag.category = "set" AND catalogue_tag.main_page = 1'
+    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"'] + [extra_where]})
     categories = split_tags(tags)
     
     form = forms.SearchForm()
-    
     return render_to_response('catalogue/main_page.html', locals(),
         context_instance=RequestContext(request))
 
@@ -110,10 +107,7 @@ def tagged_object_list(request, 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"'
+    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)