klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-26 02:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: refactor user picture page algorithm

Browse Source 
Signed-off-by: Skia <skia@libskia.so>
This commit is contained in:
Skia 2017-08-02 20:12:36 +02:00
parent 3eea8ed4e3
commit 61d2765510
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/templates/core/user_pictures.jinja
View File

@ -5,15 +5,14 @@
{% endblock %}
{% block content %}
{% set picture_qs = profile.pictures.exclude(picture=None).order_by('-picture__parent__id', 'id').select_related('picture__parent__parent__name') %}
{% for a in picture_qs.distinct('picture__parent') %}
{% for a in albums %}
<div style="padding: 10px">
<h4>{{ a.picture.parent.name }}</h4>
<h4>{{ a.name }}</h4>
<hr>
{% for r in picture_qs.filter(picture__parent=a.picture.parent) -%}
{% for picture in pictures[a.id] %}
<div class="picture">
<a href="{{ url("sas:picture", picture_id=r.picture.id) }}#pict">
<img src="{{ r.picture.get_download_thumb_url() }}" alt="{{ r.picture.get_display_name() }}" style="max-width: 100%"/>
<a href="{{ url("sas:picture", picture_id=picture.id) }}#pict">
<img src="{{ picture.get_download_thumb_url() }}" alt="{{ picture.get_display_name() }}" style="max-width: 100%"/>
</a>
</div>
{% endfor %}

15
core/views/user.py
View File

@ -258,6 +258,21 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
template_name = "core/user_pictures.jinja"
current_tab = 'pictures'
def get_context_data(self, **kwargs):
kwargs = super(UserPicturesView, self).get_context_data(**kwargs)
kwargs['albums'] = []
kwargs['pictures'] = {}
picture_qs = self.object.pictures.exclude(picture=None).order_by('-picture__parent__date', 'id').select_related('picture__parent__name')
last_album = None
for pict_relation in picture_qs:
album = pict_relation.picture.parent
if album.id != last_album:
kwargs['albums'].append(album)
kwargs['pictures'][album.id] = []
last_album = album.id
print(album, album.date)
kwargs['pictures'][album.id].append(pict_relation.picture)
return kwargs
class UserGodfathersView(UserTabsMixin, CanViewMixin, DetailView):
"""