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

Fix user picture view with Jinja update

Browse Source
This commit is contained in:
Skia 2017-02-23 00:27:53 +01:00
parent d3514e85f4
commit 5897318cc6
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,27 +5,19 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% set album = None %} {% set picture_qs = profile.pictures.exclude(picture=None).order_by('-picture__parent__id', 'id').select_related('picture__parent__parent__name') %}
{% set new_album = True %} {% for a in picture_qs.distinct('picture__parent') %}
{% for r in profile.pictures.exclude(picture=None).order_by('-picture__parent__id', 'id') -%}
{%- if album != r.picture.parent %}
{%- if album %}
</div>
{% endif -%}
{% set new_album = True %}
{% set album = r.picture.parent %}
<div style="padding: 10px"> <div style="padding: 10px">
<h4>{{ album.name }}</h4> <h4>{{ a.picture.parent.name }}</h4>
<hr> <hr>
{% else %} {% for r in picture_qs.filter(picture__parent=a.picture.parent) -%}
{% set new_album = False %}
{%- endif %}
<div class="picture"> <div class="picture">
<a href="{{ url("sas:picture", picture_id=r.picture.id) }}#pict"> <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%"/> <img src="{{ r.picture.get_download_thumb_url() }}" alt="{{ r.picture.get_display_name() }}" style="max-width: 100%"/>
</a> </a>
</div> </div>
{%- endfor %} {% endfor %}
</div> </div>
{% endfor %}
{% endblock %} {% endblock %}

4
core/views/user.py
View File

@ -502,8 +502,8 @@ class UserAccountView(UserAccountBase):
(lambda q: q.amount) (lambda q: q.amount)
) )
kwargs['etickets'] = self.object.customer.buyings.exclude(product__eticket=None).all() kwargs['etickets'] = self.object.customer.buyings.exclude(product__eticket=None).all()
except: except Exception as e:
pass print(repr(e))
return kwargs return kwargs
class UserAccountDetailView(UserAccountBase, YearMixin, MonthMixin): class UserAccountDetailView(UserAccountBase, YearMixin, MonthMixin):