fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove piston, keep just the models.
[wolnelektury.git]
/
src
/
picture
/
views.py
diff --git
a/src/picture/views.py
b/src/picture/views.py
index
35e9b5f
..
6ace134
100644
(file)
--- a/
src/picture/views.py
+++ b/
src/picture/views.py
@@
-32,14
+32,12
@@
from wolnelektury.utils import ajax
def picture_list_thumb(request, filter=None, get_filter=None, template_name='picture/picture_list_thumb.html',
cache_key=None, context=None):
def picture_list_thumb(request, filter=None, get_filter=None, template_name='picture/picture_list_thumb.html',
cache_key=None, context=None):
-
book_list
= Picture.objects.all()
+
pictures
= Picture.objects.all()
if filter:
if filter:
-
book_list = book_list
.filter(filter)
+
pictures = pictures
.filter(filter)
if get_filter:
if get_filter:
- book_list = book_list.filter(get_filter())
- book_list = book_list.order_by('sort_key_author')
- book_list = list(book_list)
- return render_to_response(template_name, {'book_list': book_list}, context_instance=RequestContext(request))
+ pictures = pictures.filter(get_filter())
+ return render_to_response(template_name, {'book_list': list(pictures)}, context_instance=RequestContext(request))
def picture_detail(request, slug):
def picture_detail(request, slug):
@@
-55,6
+53,7
@@
def picture_detail(request, slug):
'picture': picture,
'themes': theme_things.get('theme', []),
'things': theme_things.get('thing', []),
'picture': picture,
'themes': theme_things.get('theme', []),
'things': theme_things.get('thing', []),
+ 'active_menu_item': 'gallery',
}, context_instance=RequestContext(request))
}, context_instance=RequestContext(request))
@@
-82,6
+81,10
@@
def picture_page(request, key=None):
'id': picture.id,
'title': picture.title,
'author': picture.author_unicode(),
'id': picture.id,
'title': picture.title,
'author': picture.author_unicode(),
+ 'epoch': picture.tag_unicode('epoch'),
+ 'kind': picture.tag_unicode('kind'),
+ 'genre': picture.tag_unicode('genre'),
+ 'style': picture.extra_info['style'],
'image_url': picture.image_file.url,
'width': picture.width,
'height': picture.height,
'image_url': picture.image_file.url,
'width': picture.width,
'height': picture.height,
@@
-125,10
+128,9
@@
def import_picture(request):
@ssi_included
def picture_mini(request, pk, with_link=True):
picture = get_object_or_404(Picture, pk=pk)
@ssi_included
def picture_mini(request, pk, with_link=True):
picture = get_object_or_404(Picture, pk=pk)
- author_str = ", ".join(tag.name for tag in picture.tags.filter(category='author'))
return render(request, 'picture/picture_mini_box.html', {
'picture': picture,
return render(request, 'picture/picture_mini_box.html', {
'picture': picture,
- 'author
_str': author_str
,
+ 'author
': picture.author_unicode()
,
'with_link': with_link,
})
'with_link': with_link,
})
@@
-139,10
+141,7
@@
def picture_short(request, pk):
return render(request, 'picture/picture_short.html', {
'picture': picture,
return render(request, 'picture/picture_short.html', {
'picture': picture,
- 'main_link': picture.get_absolute_url(),
- 'request': request,
- 'tags': split_tags(picture.tags),
- })
+ })
@ssi_included
@ssi_included