X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/2c7b7a116ebce28ca62052456e8eaae5176e1786..6034428b14b634d1801e2d8279b1a0863b918a48:/src/catalogue/models/tag.py?ds=inline diff --git a/src/catalogue/models/tag.py b/src/catalogue/models/tag.py index 828a8b191..1b4160121 100644 --- a/src/catalogue/models/tag.py +++ b/src/catalogue/models/tag.py @@ -14,7 +14,7 @@ from django.db.models.query import Prefetch from django.dispatch import Signal from django.utils.translation import ugettext_lazy as _ -from newtagging.models import TagBase +from newtagging.models import TagManager, TaggedItemManager from ssify import flush_ssi_includes @@ -37,18 +37,20 @@ class TagRelation(models.Model): object_id = models.PositiveIntegerField(_('object id'), db_index=True) content_object = GenericForeignKey('content_type', 'object_id') + objects = TaggedItemManager() + class Meta: db_table = 'catalogue_tag_relation' unique_together = (('tag', 'content_type', 'object_id'),) - def __unicode__(self): + def __str__(self): try: return u'%s [%s]' % (self.content_type.get_object_for_this_type(pk=self.object_id), self.tag) except ObjectDoesNotExist: return u' [%s]' % self.tag -class Tag(TagBase): +class Tag(models.Model): """A tag attachable to books and fragments (and possibly anything). Used to represent searchable metadata (authors, epochs, genres, kinds), @@ -60,6 +62,9 @@ class Tag(TagBase): _('category'), max_length=50, blank=False, null=False, db_index=True, choices=TAG_CATEGORIES) description = models.TextField(_('description'), blank=True) + for_books = models.BooleanField(default=False) + for_pictures = models.BooleanField(default=False) + user = models.ForeignKey(User, blank=True, null=True) gazeta_link = models.CharField(blank=True, max_length=240) culturepl_link = models.CharField(blank=True, max_length=240) @@ -71,6 +76,7 @@ class Tag(TagBase): after_change = Signal(providing_args=['instance', 'languages']) intermediary_table_model = TagRelation + objects = TagManager() class UrlDeprecationWarning(DeprecationWarning): def __init__(self, tags=None): @@ -86,7 +92,7 @@ class Tag(TagBase): 'polka': 'set', 'obiekt': 'thing', } - categories_dict = dict((item[::-1] for item in categories_rev.iteritems())) + categories_dict = dict((item[::-1] for item in categories_rev.items())) class Meta: ordering = ('sort_key',) @@ -149,7 +155,7 @@ class Tag(TagBase): flush_ssi_includes([ '/katalog/%s.json' % lang for lang in languages]) - def __unicode__(self): + def __str__(self): return self.name def __repr__(self): @@ -163,6 +169,10 @@ class Tag(TagBase): else: return '' + @property + def category_plural(self): + return self.category + 's' + @permalink def get_absolute_url(self): return 'tagged_object_list', [self.url_chunk] @@ -171,13 +181,6 @@ class Tag(TagBase): def get_absolute_gallery_url(self): 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)) - ]) - def has_description(self): return len(self.description) > 0 has_description.short_description = _('description') @@ -185,41 +188,38 @@ class Tag(TagBase): @staticmethod def get_tag_list(tag_str): - if isinstance(tag_str, basestring): - if not tag_str: - return [] - tags = [] - ambiguous_slugs = [] - category = None - deprecated = False - tags_splitted = tag_str.split('/') - for name in tags_splitted: - if category: - tags.append(Tag.objects.get(slug=name, category=category)) - category = None - elif name in Tag.categories_rev: - category = Tag.categories_rev[name] - else: - try: - tags.append(Tag.objects.get(slug=name)) - deprecated = True - except Tag.MultipleObjectsReturned: - ambiguous_slugs.append(name) - + if not tag_str: + return [] + tags = [] + ambiguous_slugs = [] + category = None + deprecated = False + tags_splitted = tag_str.split('/') + for name in tags_splitted: if category: - # something strange left off - raise Tag.DoesNotExist() - if ambiguous_slugs: - # some tags should be qualified - e = Tag.MultipleObjectsReturned() - e.tags = tags - e.ambiguous_slugs = ambiguous_slugs - raise e - if deprecated: - raise Tag.UrlDeprecationWarning(tags=tags) - return tags - else: - return TagBase.get_tag_list(tag_str) + tags.append(Tag.objects.get(slug=name, category=category)) + category = None + elif name in Tag.categories_rev: + category = Tag.categories_rev[name] + else: + try: + tags.append(Tag.objects.get(slug=name)) + deprecated = True + except Tag.MultipleObjectsReturned: + ambiguous_slugs.append(name) + + if category: + # something strange left off + raise Tag.DoesNotExist() + if ambiguous_slugs: + # some tags should be qualified + e = Tag.MultipleObjectsReturned() + e.tags = tags + e.ambiguous_slugs = ambiguous_slugs + raise e + if deprecated: + raise Tag.UrlDeprecationWarning(tags=tags) + return tags @property def url_chunk(self): @@ -227,14 +227,14 @@ class Tag(TagBase): @staticmethod def tags_from_info(info): - from fnpdjango.utils.text.slughifi import slughifi + from slugify import slugify from sortify import sortify meta_tags = [] categories = (('kinds', 'kind'), ('genres', 'genre'), ('authors', 'author'), ('epochs', 'epoch')) for field_name, category in categories: try: tag_names = getattr(info, field_name) - except KeyError: + except (AttributeError, KeyError): # TODO: shouldn't be KeyError here at all. try: tag_names = [getattr(info, category)] except KeyError: @@ -248,9 +248,9 @@ class Tag(TagBase): tag_name = tag_name.readable() if lang == settings.LANGUAGE_CODE: # Allow creating new tag, if it's in default language. - tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name), category=category) + tag, created = Tag.objects.get_or_create(slug=slugify(tag_name), category=category) if created: - tag_name = unicode(tag_name) + tag_name = str(tag_name) tag.name = tag_name setattr(tag, "name_%s" % lang, tag_name) tag.sort_key = sortify(tag_sort_key.lower()) @@ -268,6 +268,9 @@ class Tag(TagBase): return meta_tags +TagRelation.tag_model = Tag + + def prefetch_relations(objects, category, only_name=True): queryset = TagRelation.objects.filter(tag__category=category).select_related('tag') if only_name: