github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixing validation issues.

Browse Source 
see #414
This commit is contained in:
Antoine Nguyen
2013-12-31 17:50:18 +01:00
parent 9ae80d74da
commit 24b7bcaf56
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/postfix_autoreply/__init__.py
+2
View File
@@ -27,6 +27,8 @@ class PostfixAutoreply(ModoExtension):
def init(self):
from modoboa.extensions.admin.models import Domain
from modoboa.extensions.postfix_autoreply.general_callbacks \
import onDomainCreated, onMailboxCreated
for dom in Domain.objects.all():
try:
modoboa/extensions/postfix_autoreply/forms.py
+8 -4
View File
@@ -30,9 +30,12 @@ class ARmessageForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super(ARmessageForm, self).__init__(*args, **kwargs)
self.fields.keyOrder = ['subject', 'content', 'fromdate', 'untildate', 'enabled']
self.fields.keyOrder = [
'subject', 'content', 'fromdate', 'untildate', 'enabled'
]
if 'instance' in kwargs and kwargs['instance'] is not None:
self.fields['fromdate'].initial = kwargs['instance'].fromdate
self.fields['fromdate'].initial = \
kwargs['instance'].fromdate.replace(second=0, microsecond=0)
self.fields['untildate'].initial = kwargs['instance'].untildate
def clean(self):
@@ -46,7 +49,7 @@ class ARmessageForm(forms.ModelForm):
raise forms.ValidationError(self._errors)
if self.cleaned_data["fromdate"] is not None:
if self.cleaned_data["fromdate"] < timezone.now():
self._errrors["fromdate"] = self.error_class([_("This date is over")])
self._errors["fromdate"] = self.error_class([_("This date is over")])
del self.cleaned_data['fromdate']
else:
self.cleaned_data['fromdate'] = timezone.now()
@@ -54,7 +57,8 @@ class ARmessageForm(forms.ModelForm):
if self.cleaned_data["untildate"] < timezone.now():
self._errors["untildate"] = self.error_class([_("This date is over")])
del self.cleaned_data['untildate']
elif self.cleaned_data['untildate'] < self.cleaned_data['fromdate']:
elif 'fromdate' in self.cleaned_data and \
self.cleaned_data['untildate'] < self.cleaned_data['fromdate']:
self._errors["untildate"] = \
self.error_class([_("Must be greater than start date")])
del self.cleaned_data['untildate']