Download as
Browse Code »

Commit d92f532f2c320d68a0ca25c1ce25163fdc05926b

Authored by Zambom
1 parent 07d37dfc
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Adding form error messages

Showing 2 changed files with 23 additions and 13 deletions   Show diff stats
subjects/forms.py
  Diff comments   View file @d92f532
... ... @@ -54,22 +54,32 @@ class CreateSubjectForm(forms.ModelForm):
54 54 if not new_tag in self.instance.tags.all():
55 55 self.instance.tags.add(new_tag)
56 56  
57   - #self.instance.save()
58   -
59 57 return self.instance
60 58  
61   - def clean(self):
62   - cleaned_data = super(CreateSubjectForm, self).clean()
63   - print("este")
64   - if cleaned_data['subscribe_begin'] > cleaned_data['end_date']:
65   - raise forms.ValidationError(_('Subscribe period should be between course time'))
66   - return cleaned_data
  59 + # def clean(self):
  60 + # cleaned_data = super(CreateSubjectForm, self).clean()
  61 + # print("este")
  62 + # if cleaned_data['subscribe_begin'] > cleaned_data['end_date']:
  63 + # self._errors['subscribe_begin'] = [_('Subscribe period should be between course time')]
  64 +
  65 + # return ValueError
  66 +
  67 + # return cleaned_data
  68 +
67 69 def clean_subscribe_begin(self):
68 70 subscribe_begin = self.cleaned_data['subscribe_begin']
  71 + end_date = self.cleaned_data['end_date']
  72 +
69 73 if subscribe_begin < datetime.datetime.today().date():
70   - print("aqui")
71   - self._errors['subscribe_begin'] = _('this date must be today or after')
  74 + self._errors['subscribe_begin'] = [_('this date must be today or after')]
  75 +
72 76 return ValueError
  77 +
  78 + if subscribe_begin > end_date:
  79 + self._errors['subscribe_begin'] = [_('Subscribe period should be between course time')]
  80 +
  81 + return ValueError
  82 +
73 83 return subscribe_begin
74 84  
75 85 class CreateTagForm(forms.ModelForm):
... ...
subjects/models.py
  Diff comments   View file @d92f532
... ... @@ -49,10 +49,10 @@ class Subject(models.Model):
49 49 def __str__(self):
50 50 return self.name
51 51  
52   - def clean(self):
  52 + # def clean(self):
53 53  
54   - if self.subscribe_begin > self.end_date:
55   - raise ValidationError(_('Subscribe period should be between course time'))
  54 + # if self.subscribe_begin > self.end_date:
  55 + # raise ValidationError(_('Subscribe period should be between course time'))
56 56  
57 57  
58 58  
... ...