X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/540e76dd8e04d7bab431da696565e826788bd218..c0a7799619e217e2eac724b1a688ad37f0182253:/src/catalogue/models/tag.py diff --git a/src/catalogue/models/tag.py b/src/catalogue/models/tag.py index c6b6f2663..dac96e248 100644 --- a/src/catalogue/models/tag.py +++ b/src/catalogue/models/tag.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # @@ -9,12 +8,12 @@ from django.core.cache import caches from django.contrib.auth.models import User from django.core.exceptions import ObjectDoesNotExist from django.db import models -from django.db.models import permalink from django.db.models.query import Prefetch from django.dispatch import Signal +from django.urls import reverse 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 @@ -32,23 +31,25 @@ TAG_CATEGORIES = ( class TagRelation(models.Model): - tag = models.ForeignKey('Tag', verbose_name=_('tag'), related_name='items') - content_type = models.ForeignKey(ContentType, verbose_name=_('content type')) + tag = models.ForeignKey('Tag', models.CASCADE, verbose_name=_('tag'), related_name='items') + content_type = models.ForeignKey(ContentType, models.CASCADE, verbose_name=_('content type')) 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), @@ -63,7 +64,7 @@ class Tag(TagBase): for_books = models.BooleanField(default=False) for_pictures = models.BooleanField(default=False) - user = models.ForeignKey(User, blank=True, null=True) + user = models.ForeignKey(User, models.CASCADE, blank=True, null=True) gazeta_link = models.CharField(blank=True, max_length=240) culturepl_link = models.CharField(blank=True, max_length=240) wiki_link = models.CharField(blank=True, max_length=240) @@ -74,6 +75,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): @@ -89,7 +91,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',) @@ -152,7 +154,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): @@ -170,20 +172,11 @@ class Tag(TagBase): def category_plural(self): return self.category + 's' - @permalink def get_absolute_url(self): - return 'tagged_object_list', [self.url_chunk] + return reverse('tagged_object_list', args=[self.url_chunk]) - @permalink 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)) - ]) + return reverse('tagged_object_list_gallery', args=[self.url_chunk]) def has_description(self): return len(self.description) > 0 @@ -192,41 +185,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): @@ -241,7 +231,7 @@ class Tag(TagBase): 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: @@ -257,7 +247,7 @@ class Tag(TagBase): # Allow creating new tag, if it's in default language. 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()) @@ -275,6 +265,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: