fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix custom pdf w/pictures
[wolnelektury.git]
/
src
/
picture
/
models.py
diff --git
a/src/picture/models.py
b/src/picture/models.py
index
dc7142c
..
6d8def3
100644
(file)
--- a/
src/picture/models.py
+++ b/
src/picture/models.py
@@
-12,6
+12,8
@@
from django.core.files.storage import FileSystemStorage
from django.utils.datastructures import SortedDict
from fnpdjango.utils.text.slughifi import slughifi
from ssify import flush_ssi_includes
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
from picture import tasks
from StringIO import StringIO
import jsonfield
@@
-112,8
+114,8
@@
class Picture(models.Model):
self.sort_key = sortify(self.title)[:120]
try:
self.sort_key = sortify(self.title)[:120]
try:
- author = self.
tags.filter(category='author')[0]
.sort_key
- except
Index
Error:
+ author = self.
authors().first()
.sort_key
+ except
Attribute
Error:
author = u''
self.sort_key_author = author
author = u''
self.sort_key_author = author
@@
-124,11
+126,15
@@
class Picture(models.Model):
def __unicode__(self):
return self.title
def __unicode__(self):
return self.title
- def author
_str
(self):
- return
", ".join(str(t) for t in self.tags.filter(category='author')
)
+ def author
s
(self):
+ return
self.tags.filter(category='author'
)
def tag_unicode(self, category):
def tag_unicode(self, category):
- return ", ".join(unicode(t) for t in self.tags.filter(category=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 self.tag_unicode('author')
def author_unicode(self):
return self.tag_unicode('author')
@@
-319,7
+325,7
@@
class Picture(models.Model):
pics_by_author[tag] = []
for pic in pics.iterator():
pics_by_author[tag] = []
for pic in pics.iterator():
- authors = list(pic.
tags.filter(category='author
'))
+ authors = list(pic.
authors().only('pk
'))
if authors:
for author in authors:
pics_by_author[author].append(pic)
if authors:
for author in authors:
pics_by_author[author].append(pic)
@@
-338,9
+344,7
@@
class Picture(models.Model):
return self._info
def pretty_title(self, html_links=False):
return self._info
def pretty_title(self, html_links=False):
- picture = self
- names = [(tag.name, tag.get_absolute_url())
- for tag in self.tags.filter(category='author')]
+ names = [(tag.name, tag.get_absolute_url()) for tag in self.authors().only('name', 'category', 'slug')]
names.append((self.title, self.get_absolute_url()))
if html_links:
names.append((self.title, self.get_absolute_url()))
if html_links: