From d4ba51292001a4e1b13427cd0c3367eefad52846 Mon Sep 17 00:00:00 2001
From: Stephan Telling <st@telling.xyz>
Date: Sat, 15 Jul 2017 18:15:14 +0200
Subject: [PATCH] fix clean method for eventinstance

You can no longer save eventinstances where the camp year doesnt match
for its location and event.
---
 src/program/models.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/program/models.py b/src/program/models.py
index 6d458d20..ddbed2c9 100644
--- a/src/program/models.py
+++ b/src/program/models.py
@@ -9,12 +9,11 @@ from datetime import timedelta
 from django.contrib.postgres.fields import DateTimeRangeField
 from django.contrib import messages
 from django.db import models
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.dispatch import receiver
 from django.utils.text import slugify
 from django.utils import timezone
 from django.conf import settings
-from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse_lazy
 from django.core.files.storage import FileSystemStorage
 from django.urls import reverse
@@ -478,13 +477,9 @@ class EventInstance(CampRelatedModel):
     def __str__(self):
         return '%s (%s)' % (self.event, self.when)
 
-    def __clean__(self):
-        errors = []
+    def clean(self):
         if self.location.camp != self.event.camp:
-            errors.append(ValidationError({'location', "Error: This location belongs to a different camp"}))
-
-        if errors:
-            raise ValidationError(errors)
+            raise ValidationError({'location': 'Error: This location belongs to a different camp'})
 
     @property
     def camp(self):