fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove obsolete jsonfield dependency.
[wolnelektury.git]
/
src
/
picture
/
templatetags
/
picture_tags.py
diff --git
a/src/picture/templatetags/picture_tags.py
b/src/picture/templatetags/picture_tags.py
index
3330b61
..
43f2775
100644
(file)
--- a/
src/picture/templatetags/picture_tags.py
+++ b/
src/picture/templatetags/picture_tags.py
@@
-7,7
+7,6
@@
from django import template
from django.urls import reverse
from django.utils.cache import add_never_cache_headers
import sorl.thumbnail.default
from django.urls import reverse
from django.utils.cache import add_never_cache_headers
import sorl.thumbnail.default
-from ssify import ssi_variable
from catalogue.utils import split_tags
from ..engine import CustomCroppingEngine
from ..models import Picture
from catalogue.utils import split_tags
from ..engine import CustomCroppingEngine
from ..models import Picture
@@
-47,7
+46,7
@@
def area_thumbnail_url(area, geometry):
# what to do about this?
_engine = sorl.thumbnail.default.engine
sorl.thumbnail.default.engine = cropper
# what to do about this?
_engine = sorl.thumbnail.default.engine
sorl.thumbnail.default.engine = cropper
- coords = to_square(area.
area
)
+ coords = to_square(area.
get_area_json()
)
try:
th = sorl.thumbnail.default.backend.get_thumbnail(
try:
th = sorl.thumbnail.default.backend.get_thumbnail(
@@
-65,13
+64,11
@@
def area_thumbnail_url(area, geometry):
return th.url
return th.url
-@ssi_variable(register, patch_response=[add_never_cache_headers])
-def picture_random_picture(request, exclude_ids, unless=None):
- if unless:
- return None
+@register.simple_tag
+def picture_random_picture(exclude_ids):
queryset = Picture.objects.exclude(pk__in=exclude_ids).exclude(image_file='')
count = queryset.count()
if count:
queryset = Picture.objects.exclude(pk__in=exclude_ids).exclude(image_file='')
count = queryset.count()
if count:
- return queryset[randint(0, count - 1)]
.pk
+ return queryset[randint(0, count - 1)]
else:
return None
else:
return None