Enlarged top margin of news list on main page.

[wolnelektury.git] / apps / newtagging / models.py

diff --git a/apps/newtagging/models.py b/apps/newtagging/models.py
index e988b6c..c2628be 100644 (file)
--- a/apps/newtagging/models.py
+++ b/apps/newtagging/models.py
@@ -225,7 +225,7 @@ class TagManager(models.Manager):
         WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
         AND %(tagged_item)s.object_id IN
         (
         WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
         AND %(tagged_item)s.object_id IN
         (

-            SELECT temporary.object_id 
+            SELECT *

             FROM (
                 SELECT %(tagged_item)s.object_id
                 FROM %(tagged_item)s, %(tag)s
             FROM (
                 SELECT %(tagged_item)s.object_id
                 FROM %(tagged_item)s, %(tag)s


@@ -236,6 +236,7 @@ class TagManager(models.Manager):
                 HAVING COUNT(%(tagged_item)s.object_id) = %(tag_count)s
             ) AS temporary
         )
                 HAVING COUNT(%(tagged_item)s.object_id) = %(tag_count)s
             ) AS temporary
         )

+        AND %(tag)s.id NOT IN (%(tag_id_placeholders)s)

         %(extra_where)s
         GROUP BY %(tag_columns)s
         %(min_count_sql)s
         %(extra_where)s
         GROUP BY %(tag_columns)s
         %(min_count_sql)s