Add killer.game != victim.game check in Kill.save()

kz26 · Feb 25, 2016 · f8eed32 · f8eed32
1 parent 99897c2
commit f8eed32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/uchicagohvz/game/admin.py b/uchicagohvz/game/admin.py
@@ -73,7 +73,7 @@ def clean_hvt(self):
 	def clean(self):
 		cleaned_data = super(KillAdminForm, self).clean()
 		if cleaned_data['killer'].game != cleaned_data['victim'].game:
-			raise forms.ValidationError('Killer and victim games do not match.')
+			raise forms.ValidationError('killer.game and victim.game do not match.')
 		return cleaned_data
 
 class KillAdmin(admin.ModelAdmin):

diff --git a/uchicagohvz/game/models.py b/uchicagohvz/game/models.py
@@ -461,6 +461,8 @@ def refresh_points(self):
 		self.points = points
 
 	def save(self, *args, **kwargs):
+		if self.killer.game != self.victim.game:
+			raise Exception('killer.game and victim.game do not match.')
 		try:
 			parent = Kill.objects.exclude(id=self.id).filter(victim=self.killer)[0]
 		except: