DGNum/ernestophone.ens.fr
6
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages Wiki Activity Actions

remove duplicate code (view_eventbis)

Browse source
This commit is contained in:
Martin Pépin 2019-03-16 18:54:29 +01:00
parent 7368f317ad
commit fe06636502
4 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
calendrier/templates/calendrier/reponse.html
View file

@ -6,7 +6,7 @@
{% if envoi %}<p>Votre réponse a été enregistrée !</p>{% endif %}
<p><a href="{% url 'calendrier:view-event2' id %}">Retour à l'événement</a></p>
<p><a href="{% url 'calendrier:view-event' id %}">Retour à l'événement</a></p>
<div> Voulez vous participer à l'événement {{ ev.nom }}, le {{ ev.date }} à {{ ev.debut|time:"H:i" }} ?</div>
<form action="{% url 'calendrier:reponse' id %}" method="post">

9
calendrier/tests/test_views.py
View file

@ -80,12 +80,7 @@ class TestViews(TestCase):
def test_get_public_event(self):
"""Public event, everyone can see"""
evt = self.pub_event
url = "/calendar/{}/{}/{}".format(evt.date.year, evt.date.month, evt.id)
self._everyone_can_get(url)
def test_get_public_event_bis(self):
"""Public event, everyone can see"""
url = "/calendar/{}".format(self.pub_event.id)
url = "/calendar/{}".format(evt.id)
self._everyone_can_get(url)
def test_get_reponse_event(self):
@ -120,7 +115,7 @@ class TestViews(TestCase):
def test_get_private_event(self):
"""Private event, restricted access"""
evt = self.priv_event
url = "/calendar/{}/{}/{}".format(evt.date.year, evt.date.month, evt.id)
url = "/calendar/{}".format(evt.id)
self._get_restricted_page(url, redirect_url="/calendar/")
def test_get_private_event_bis(self):

3
calendrier/urls.py
View file

@ -14,7 +14,6 @@ urlpatterns = [
path("changename", views.changename, name="change-doodle-name"),
path("<int:id>/reponse", views.reponse, name="reponse"),
path("rep/<slug:codeus>/<slug:codeev>/<slug:coderep>", views.reponse_event, name="reponse_event"),
path("<int:pYear>/<int:pMonth>/<int:id>", views.view_event, name="view-event"),
path("<int:pYear>/<int:pMonth>", views.calendar, name="view-month"),
path("<int:id>", views.view_eventbis, name="view-event2"),
path("<int:id>", views.view_event, name="view-event"),
]

26
calendrier/views.py
View file

@ -69,25 +69,7 @@ def calendar(request, pYear, pMonth):
})
def view_event(request, pYear, pMonth, id):
ev = get_object_or_404(Event, id=id)
if not request.user.is_authenticated and not ev.calendrier:
return redirect(reverse('calendrier:home'))
nom = ev.nom.capitalize
fin = False
desc = False
part = ev.participants_set.all()
nboui = len(part.filter(reponse="oui"))
nbpe = len(part.filter(reponse="pe"))
nbnon = len(part.filter(reponse="non"))
if ev.fin:
fin = True
if ev.description:
desc = True
return render(request, 'calendrier/view_event.html', locals())
def view_eventbis(request, id):
def view_event(request, id):
ev = get_object_or_404(Event, id=id)
if not request.user.is_authenticated and not ev.calendrier:
return redirect(reverse('calendrier:home'))
@ -131,7 +113,7 @@ def resend(request, id):
'Pour répondre non, allez sur %s%s\n'
'Pour répondre peut-être, allez sur %s%s\n') \
% (domain,
reverse_lazy('view-event', args=[ev.id]),
reverse_lazy('calendrier:view-event', args=[ev.id]),
domain,
reverse_lazy('calendrier.reponse_event', args=[user.slug, ev.slug, "oui"]),
domain,
@ -142,7 +124,7 @@ def resend(request, id):
send_mail(Subject, text, sender, receivers)
except:
erreur = "Une erreur est survenue, le mail n'a pas pu être envoyé."
return redirect("calendrier:view-event2", id)
return redirect("calendrier:view-event", id)
else:
form = SendMail()
return render(request, "calendrier/resend.html", locals())
@ -202,7 +184,7 @@ def create_event(request):
'Pour répondre non, allez sur %s%s\n'
'Pour répondre peut-être, allez sur %s%s\n') \
% (domain,
reverse('view-event', args=[obj.id]),
reverse('calendrier:view-event', args=[obj.id]),
domain,
reverse('calendrier.reponse_event', args=[user.slug, obj.slug, "oui"]),
domain,