Added alternative texts to images.

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

diff --git a/apps/newtagging/models.py b/apps/newtagging/models.py
index e121994..2055ec3 100644 (file)
--- a/apps/newtagging/models.py
+++ b/apps/newtagging/models.py
@@ -1,8 +1,12 @@
+# -*- coding: utf-8 -*-

 """
 Models and managers for generic tagging.
 """
 """
 Models and managers for generic tagging.
 """

+

 # Python 2.3 compatibility
 # Python 2.3 compatibility

-if not hasattr(__builtins__, 'set'):
+try:
+    set
+except NameError: 

     from sets import Set as set
 
 from django.contrib.contenttypes import generic
     from sets import Set as set
 
 from django.contrib.contenttypes import generic


@@ -108,7 +112,7 @@ class TagManager(models.Manager):
         WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
             %%s
             %(extra_where)s
         WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
             %%s
             %(extra_where)s

-        GROUP BY %(tag)s.id, %(tag)s.name
+        GROUP BY %(tag_columns)s, %(tag)s.id, %(tag)s.name

         %%s
         ORDER BY %(tag)s.%(ordering)s ASC""" % {
             'tag': qn(self.model._meta.db_table),
         %%s
         ORDER BY %(tag)s.%(ordering)s ASC""" % {
             'tag': qn(self.model._meta.db_table),