klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-07-03 11:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'elections' into 'master'

Browse Source 
Avoid moving role order in election by reloading page

See merge request ae/Sith!136
This commit is contained in:
Antoine Bartuccio 2017-12-05 14:30:52 +01:00
commit c8fae39ff0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
election/templates/election/election_detail.jinja
View File

@ -280,7 +280,7 @@ th {
<tbody data-max-choice="{{role.max_choice}}" class="role{{ ' role_error' if role.title in election_form.errors else '' }}{{ ' role__multiple-choices' if role.max_choice > 1 else ''}}"> <tbody data-max-choice="{{role.max_choice}}" class="role{{ ' role_error' if role.title in election_form.errors else '' }}{{ ' role__multiple-choices' if role.max_choice > 1 else ''}}">
<tr class="role__title"> <tr class="role__title">
<td colspan="{{ election_lists.count() + 1 }}"> <td colspan="{{ election_lists.count() + 1 }}">
<span>{{ role.title }}</span> <span><b>{{ role.title }}</b></span>
{% if user.can_edit(role) and election.is_vote_editable -%} {% if user.can_edit(role) and election.is_vote_editable -%}
<a href="{{url('election:update_role', role_id=role.id)}}">{% trans %}Edit{% endtrans %}</a> <a href="{{url('election:update_role', role_id=role.id)}}">{% trans %}Edit{% endtrans %}</a>
<a href="{{url('election:delete_role', role_id=role.id)}}">{% trans %}Delete{% endtrans %}</a> <a href="{{url('election:delete_role', role_id=role.id)}}">{% trans %}Delete{% endtrans %}</a>

2
election/views.py
View File

@ -7,6 +7,7 @@ from django.utils.translation import ugettext_lazy as _
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.db import transaction from django.db import transaction
from django.forms import CheckboxSelectMultiple from django.forms import CheckboxSelectMultiple
from django.shortcuts import redirect
from django import forms from django import forms
from core.views import CanViewMixin, CanEditMixin, CanCreateMixin from core.views import CanViewMixin, CanEditMixin, CanCreateMixin
@ -192,6 +193,7 @@ class ElectionDetailView(CanViewMixin, DetailView):
Role.objects.get(id=role).bottom() Role.objects.get(id=role).bottom()
elif action == "top": elif action == "top":
Role.objects.get(id=role).top() Role.objects.get(id=role).top()
return redirect(reverse_lazy('election:detail', kwargs={'election_id': election.id}))
return r return r
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):