From 556908535b47d6cc928c041532529e552f1d53b3 Mon Sep 17 00:00:00 2001 From: Gustavo Date: Thu, 31 Aug 2017 12:13:36 -0300 Subject: [PATCH] Adjusting validation for subject name in forms.py --- subjects/forms.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/subjects/forms.py b/subjects/forms.py index 3596053..cfd0e78 100644 --- a/subjects/forms.py +++ b/subjects/forms.py @@ -58,11 +58,11 @@ class CreateSubjectForm(forms.ModelForm): def clean_name(self): name = self.cleaned_data.get('name') + categoria = self.instance.category if self.instance.id: - same_name = Subject.objects.filter(name__unaccent__iexact = name).exclude(id = self.instance.id) + same_name = Subject.objects.filter(name__unaccent__iexact = name, category = categoria).exclude(id = self.instance.id) else: - same_name = Subject.objects.filter(name__unaccent__iexact = name) - + same_name = Subject.objects.filter(name__unaccent__iexact = name, category = categoria) if same_name.count() > 0: self._errors['name'] = [_('There is another subject with this name, try another one.')] @@ -161,11 +161,11 @@ class UpdateSubjectForm(forms.ModelForm): def clean_name(self): name = self.cleaned_data.get('name') + categoria = self.instance.category if self.instance.id: - same_name = Subject.objects.filter(name__unaccent__iexact = name).exclude(id = self.instance.id) + same_name = Subject.objects.filter(name__unaccent__iexact = name , category = categoria).exclude(id = self.instance.id) else: - same_name = Subject.objects.filter(name__unaccent__iexact = name) - + same_name = Subject.objects.filter(name__unaccent__iexact = name).exclude(category = categoria) if same_name.count() > 0: self._errors['name'] = [_('There is another subject with this name, try another one.')] -- libgit2 0.21.2