klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-09 19:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added screen list on poster + Added unmoderated poster artefact + discussions fixes

Browse Source
This commit is contained in:
gnikwo
2017-12-21 12:25:07 +01:00
parent 72d2862e3e
commit 903f07ecbd
7 changed files with 43 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
com/templates/com/poster_list.jinja
View File

@ -32,7 +32,7 @@
{% else %}
{% for poster in poster_list %}
<div class="poster">
<div class="poster{% if not poster.is_moderated %} not_moderated{% endif %}">
<div class="name">{{ poster.name }}</div>
<div class="image"><img src="{{ poster.file.url }}"></img></div>
<div class="dates">
@ -44,6 +44,13 @@
{% elif app == "club" %}
<a class="edit" href="{{ url(app + ":poster_edit", club.id, poster.id) }}">{% trans %}Edit{% endtrans %}</a>
{% endif %}
<div class="tooltip">
<ul>
{% for screen in poster.screens.all() %}
<li>{{ screen }}</li>
{% endfor %}
</ul>
</div>
</div>
{% endfor %}

2
com/templates/com/poster_moderate.jinja
View File

@ -22,7 +22,7 @@
{% else %}
{% for poster in object_list %}
<div class="poster">
<div class="poster{% if not poster.is_moderated %} not_moderated{% endif %}">
<div class="name"> {{ poster.name }} </div>
<div class="image"> <img src="{{ poster.file.url }}"></img> </div>
<a class="moderate" href="{{ url("com:poster_moderate", object_id=poster.id) }}">Moderate</a>

3
com/views.py
View File

@ -540,7 +540,6 @@ class PosterCreateBaseView(CreateView):
def dispatch(self, request, *args, **kwargs):
if 'club_id' in kwargs:
self.club = get_object_or_404(Club, pk=kwargs['club_id'])
print(self.club)
return super(PosterCreateBaseView, self).dispatch(request, *args, **kwargs)
def get_form_kwargs(self):
@ -590,7 +589,7 @@ class PosterEditBaseView(UpdateView):
return kwargs
def form_valid(self, form):
if 'club' in self.__dict__ and self.club:
if self.request.user.is_com_admin:
form.instance.is_moderated = False
return super(PosterEditBaseView, self).form_valid(form)