From ca4d19001f1b7101e1863858d2bd63a1bef567c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Loipf=C3=BChrer?= <michael.loipfuehrer@stusta.de>
Date: Wed, 4 Nov 2020 14:59:04 +0100
Subject: [PATCH] fix reminder templating
---
management/views.py | 9 ++++-----
vote/models.py | 8 ++++----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/management/views.py b/management/views.py
index 2ed77f7..671ad21 100644
--- a/management/views.py
+++ b/management/views.py
@@ -132,15 +132,14 @@ def add_election(request, pk=None):
test_voter = Namespace(**{
"name": "Testname",
- "email": form.data['email'],
+ "email": form.cleaned_data['email'],
})
test_voter.email_user = partial(Voter.email_user, test_voter)
test_election = Namespace(**{
- "title": form.data['title'],
- "remind_text": form.data['remind_text'],
+ "title": form.cleaned_data['title'],
+ "remind_text": form.cleaned_data['remind_text'],
"pk": 1,
- "start_date": datetime.fromisoformat(form.data['start_date']) if form.data[
- 'start_date'] else datetime.now(),
+ "end_date": datetime.fromisoformat(form.cleaned_data['end_date']) if form.cleaned_data['end_date'] else None,
})
Voter.send_reminder(test_voter, manager.stusta_email, test_election)
diff --git a/vote/models.py b/vote/models.py
index 6377184..96fceb5 100644
--- a/vote/models.py
+++ b/vote/models.py
@@ -311,10 +311,10 @@ class Voter(models.Model):
'name': self.name,
'title': election.title,
'url': 'https://vote.stustanet.de' + reverse('vote:vote', kwargs={'election_id': election.pk}),
- 'end_date': election.start_date.strftime("%d.%m.%y") if election.start_date else "",
- 'end_time': election.start_date.strftime("%H:%M") if election.start_date else "",
- 'end_date_en': election.start_date.strftime("%Y/%m/%d") if election.start_date else "",
- 'end_time_en': election.start_date.strftime("%I:%M %p") if election.start_date else "",
+ 'end_date': election.end_date.strftime("%d.%m.%y") if election.end_date else "",
+ 'end_time': election.end_date.strftime("%H:%M") if election.end_date else "",
+ 'end_date_en': election.end_date.strftime("%Y/%m/%d") if election.end_date else "",
+ 'end_time_en': election.end_date.strftime("%I:%M %p") if election.end_date else "",
}
body_html = election.remind_text.format(**context)
else:
--
GitLab