from django.db.models import permalink
from django.dispatch import Signal
from django.utils.translation import ugettext_lazy as _
+
from newtagging.models import TagBase
from ssify import flush_ssi_includes
('genre', _('genre')),
('theme', _('theme')),
('set', _('set')),
- ('thing', _('thing')), # things shown on pictures
+ ('thing', _('thing')), # things shown on pictures
)
name = models.CharField(_('name'), max_length=120, db_index=True)
slug = models.SlugField(_('slug'), max_length=120, db_index=True)
sort_key = models.CharField(_('sort key'), max_length=120, db_index=True)
- category = models.CharField(_('category'), max_length=50, blank=False, null=False,
- db_index=True, choices=TAG_CATEGORIES)
+ category = models.CharField(
+ _('category'), max_length=50, blank=False, null=False, db_index=True, choices=TAG_CATEGORIES)
description = models.TextField(_('description'), blank=True)
user = models.ForeignKey(User, blank=True, null=True)
after_change = Signal(providing_args=['instance', 'languages'])
class UrlDeprecationWarning(DeprecationWarning):
- pass
+ def __init__(self, tags=None):
+ super(Tag.UrlDeprecationWarning, self).__init__()
+ self.tags = tags
categories_rev = {
'autor': 'author',
elif self.name:
return self.name[0]
else:
- return None
+ return ''
@permalink
def get_absolute_url(self):
- return ('tagged_object_list', [self.url_chunk])
+ return 'tagged_object_list', [self.url_chunk]
@permalink
def get_absolute_gallery_url(self):
- return ('tagged_object_list_gallery', [self.url_chunk])
+ return 'tagged_object_list_gallery', [self.url_chunk]
@classmethod
@permalink
def create_url(cls, category, slug):
return ('catalogue.views.tagged_object_list', [
- '/'.join((cls.categories_dict[category], slug))
- ])
+ '/'.join((cls.categories_dict[category], slug))
+ ])
def has_description(self):
return len(self.description) > 0
@staticmethod
def get_tag_list(tags):
if isinstance(tags, basestring):
- if not tags: return []
+ if not tags:
+ return []
real_tags = []
ambiguous_slugs = []
category = None
try:
real_tags.append(Tag.objects.get(slug=name))
deprecated = True
- except Tag.MultipleObjectsReturned, e:
+ except Tag.MultipleObjectsReturned:
ambiguous_slugs.append(name)
if category:
e.ambiguous_slugs = ambiguous_slugs
raise e
if deprecated:
- e = Tag.UrlDeprecationWarning()
- e.tags = real_tags
- raise e
+ raise Tag.UrlDeprecationWarning(tags=real_tags)
return real_tags
else:
return TagBase.get_tag_list(tags)
for field_name, category in categories:
try:
tag_names = getattr(info, field_name)
- except:
+ except KeyError:
try:
tag_names = [getattr(info, category)]
- except:
+ except KeyError:
# For instance, Pictures do not have 'genre' field.
continue
for tag_name in tag_names:
lang = getattr(tag_name, 'lang', settings.LANGUAGE_CODE)
tag_sort_key = tag_name
if category == 'author':
- tag_sort_key = tag_name.last_name
+ tag_sort_key = ' '.join((tag_name.last_name,) + tag_name.first_names)
tag_name = tag_name.readable()
if lang == settings.LANGUAGE_CODE:
# Allow creating new tag, if it's in default language.