CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix relative dates in payment method availability field

Browse Source
This commit is contained in:
Raphael Michel
2017-07-13 17:37:07 +02:00
parent ae910eb731
commit 5a8042cc10
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/reldate.py
View File

@@ -104,6 +104,8 @@ class RelativeDateTimeWidget(forms.MultiWidget):
super().__init__(widgets=widgets, *args, **kwargs) super().__init__(widgets=widgets, *args, **kwargs)
def decompress(self, value): def decompress(self, value):
if isinstance(value, str):
value = RelativeDateWrapper.from_string(value)
if not value: if not value:
return ['unset', None, 1, 'date_from', None] return ['unset', None, 1, 'date_from', None]
elif isinstance(value.data, (datetime.datetime, datetime.date)): elif isinstance(value.data, (datetime.datetime, datetime.date)):
@@ -193,6 +195,8 @@ class RelativeDateWidget(RelativeDateTimeWidget):
forms.MultiWidget.__init__(self, widgets=widgets, *args, **kwargs) forms.MultiWidget.__init__(self, widgets=widgets, *args, **kwargs)
def decompress(self, value): def decompress(self, value):
if isinstance(value, str):
value = RelativeDateWrapper.from_string(value)
if not value: if not value:
return ['unset', None, 1, 'date_from'] return ['unset', None, 1, 'date_from']
elif isinstance(value.data, (datetime.datetime, datetime.date)): elif isinstance(value.data, (datetime.datetime, datetime.date)):