Commit 5f77c96d authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch '284-einddatum-commissielidmaatschap-mag-wel-in-de-toekomst-liggen' into 'master'

Enforce committee membership enddates in the past

Closes #284

See merge request !335
parents 96e454a6 afb3a7dc
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-30 17:52+0100\n"
"PO-Revision-Date: 2017-01-30 17:53+0100\n"
"POT-Creation-Date: 2017-01-30 18:53+0100\n"
"PO-Revision-Date: 2017-01-30 18:54+0100\n"
"Last-Translator: Joost Rijneveld <>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -66,7 +66,7 @@ msgstr "Is dit een bestuur"
msgid "A board already exists for those years"
msgstr "Er bestaat al een bestuur voor die jaren"
msgid "Member"
msgstr "Lid"
......@@ -112,27 +112,31 @@ msgstr "De rol van dit lid binnen de commissie"
msgid "End date can't be before start date"
msgstr "De einddatum kan niet voor de startdatum liggen"
msgid "End date can't be in the future"
msgstr "De einddatum kan niet in de toekomst liggen"
msgid "End date cannot be set for boards"
msgstr "Voor besturen kan geen einddatum worden opgegeven"
msgid "There already is a chair for this time period"
msgstr "Er is al een voorzitter voor deze periode"
msgid "This member is already in the committee for this period"
msgstr "Deze persoon is al lid van deze commissie in de aangegeven periode"
msgid "committee membership"
msgstr "commissielidmaatschap"
msgid "committee memberships"
msgstr "commissielidmaatschappen"
#, python-brace-format
msgid "{name} mentor in {year}"
msgstr "{name} mentor in {year}"
......@@ -223,6 +223,9 @@ class CommitteeMembership(models.Model, metaclass=ModelTranslateMeta):
if self.until and (not self.since or self.until < self.since):
raise ValidationError(
{'until': _("End date can't be before start date")})
if self.until and self.until >
raise ValidationError(
{'until': _("End date can't be in the future")})
if self.until and self.committee.board:
raise ValidationError(
......@@ -274,7 +277,7 @@ class CommitteeMembership(models.Model, metaclass=ModelTranslateMeta):
.count()) >= 1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment