from django.utils.datastructures import SortedDict
from fnpdjango.utils.text.slughifi import slughifi
from ssify import flush_ssi_includes
+
+from catalogue.models.tag import prefetched_relations
from picture import tasks
from StringIO import StringIO
import jsonfield
pass
class Meta:
- ordering = ('sort_key',)
+ ordering = ('sort_key_author', 'sort_key')
verbose_name = _('picture')
verbose_name_plural = _('pictures')
def authors(self):
return self.tags.filter(category='author')
+ def tag_unicode(self, category):
+ relations = prefetched_relations(self, category)
+ if relations:
+ return ', '.join(rel.tag.name for rel in relations)
+ else:
+ return ', '.join(self.tags.filter(category=category).values_list('name', flat=True))
+
def author_unicode(self):
- return ", ".join(self.authors().values_list('name', flat=True))
+ return self.tag_unicode('author')
@permalink
def get_absolute_url(self):
picture.extra_info = picture_xml.picture_info.to_dict()
picture_tags = set(catalogue.models.Tag.tags_from_info(picture_xml.picture_info))
- motif_tags = set()
- thing_tags = set()
area_data = {'themes': {}, 'things': {}}
if part.get('object', None) is not None:
_tags = set()
for objname in part['object'].split(','):
- objname = objname.strip().capitalize()
+ objname = objname.strip()
+ assert objname, 'Empty object name'
+ # str.capitalize() is wrong, because it also lowers letters
+ objname = objname[0].upper() + objname[1:]
tag, created = catalogue.models.Tag.objects.get_or_create(
slug=slughifi(objname), category='thing')
if created:
area.save()
area.tags = _tags.union(picture_tags)
- picture.tags = picture_tags.union(motif_tags).union(thing_tags)
+ picture.tags = picture_tags
picture.areas_json = area_data
if image_file is not None: