X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/64af15fe792f42d3a7dc3e857a45577d16806255..592c9401b18118e01de250d44878b9289b138f9c:/src/catalogue/models/tag.py diff --git a/src/catalogue/models/tag.py b/src/catalogue/models/tag.py index 31da2564b..3c2a53610 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,13 +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 TagManager, TaggedItemManager -from ssify import flush_ssi_includes # Those are hard-coded here so that makemessages sees them. @@ -32,8 +30,8 @@ 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') @@ -43,11 +41,11 @@ class TagRelation(models.Model): 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) + return '%s [%s]' % (self.content_type.get_object_for_this_type(pk=self.object_id), self.tag) except ObjectDoesNotExist: - return u' [%s]' % self.tag + return ' [%s]' % self.tag class Tag(models.Model): @@ -65,15 +63,17 @@ class Tag(models.Model): 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) + photo = models.FileField(blank=True, null=True, upload_to='catalogue/tag/') + photo_attribution = models.CharField(max_length=255, blank=True) created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True) changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True) - after_change = Signal(providing_args=['instance', 'languages']) + after_change = Signal(providing_args=['instance']) intermediary_table_model = TagRelation objects = TagManager() @@ -92,7 +92,7 @@ class Tag(models.Model): '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',) @@ -102,60 +102,13 @@ class Tag(models.Model): app_label = 'catalogue' def save(self, *args, **kwargs): - flush_cache = flush_all_includes = False - if self.pk and self.category != 'set': - # Flush the whole views cache. - # Seem a little harsh, but changed tag names, descriptions - # and links come up at any number of places. - flush_cache = True - - # Find in which languages we need to flush related includes. - old_self = type(self).objects.get(pk=self.pk) - # Category shouldn't normally be changed, but just in case. - if self.category != old_self.category: - flush_all_includes = True - languages_changed = self.languages_changed(old_self) - + existing = self.pk and self.category != 'set' ret = super(Tag, self).save(*args, **kwargs) - - if flush_cache: - caches[settings.CACHE_MIDDLEWARE_ALIAS].clear() - if flush_all_includes: - flush_ssi_includes() - else: - self.flush_includes() - self.after_change.send(sender=type(self), instance=self, languages=languages_changed) - + if existing: + self.after_change.send(sender=type(self), instance=self) return ret - def languages_changed(self, old): - all_langs = [lc for (lc, _ln) in settings.LANGUAGES] - if (old.category, old.slug) != (self.category, self.slug): - return all_langs - languages = set() - for lang in all_langs: - name_field = 'name_%s' % lang - if getattr(old, name_field) != getattr(self, name_field): - languages.add(lang) - return languages - - def flush_includes(self, languages=True): - if not languages: - return - if languages is True: - languages = [lc for (lc, _ln) in settings.LANGUAGES] - flush_ssi_includes([ - template % (self.pk, lang) - for template in [ - '/api/include/tag/%d.%s.json', - '/api/include/tag/%d.%s.xml', - ] - for lang in languages - ]) - flush_ssi_includes([ - '/katalog/%s.json' % lang for lang in languages]) - - def __unicode__(self): + def __str__(self): return self.name def __repr__(self): @@ -173,13 +126,11 @@ class Tag(models.Model): 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] + return reverse('tagged_object_list_gallery', args=[self.url_chunk]) def has_description(self): return len(self.description) > 0 @@ -234,7 +185,7 @@ class Tag(models.Model): 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: @@ -250,7 +201,7 @@ class Tag(models.Model): # 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())