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

Allow to shred data 30 days after event (instead of 60)

Browse Source
This commit is contained in:
Raphael Michel
2020-06-11 10:44:09 +02:00
parent 3ae148956f
commit d0c6f0f0e9
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/base/shredder.py
View File

@@ -34,11 +34,11 @@ def shred_constraints(event: Event):
max_fromto=Greatest(Max('date_to'), Max('date_from'))
)
max_date = max_date['max_fromto'] or max_date['max_to'] or max_date['max_from']
if max_date is not None and max_date > now() - timedelta(days=60):
return _('Your event needs to be over for at least 60 days to use this feature.')
if max_date is not None and max_date > now() - timedelta(days=30):
return _('Your event needs to be over for at least 30 days to use this feature.')
else:
if (event.date_to or event.date_from) > now() - timedelta(days=60):
return _('Your event needs to be over for at least 60 days to use this feature.')
if (event.date_to or event.date_from) > now() - timedelta(days=30):
return _('Your event needs to be over for at least 30 days to use this feature.')
if event.live:
return _('Your ticket shop needs to be offline to use this feature.')
return None

24
src/tests/base/test_shredders.py
View File

@@ -341,31 +341,31 @@ def test_shred_constraint_offline(event):
@pytest.mark.django_db
def test_shred_constraint_60_days(event):
def test_shred_constraint_30_days(event):
event.live = False
event.date_from = now() - timedelta(days=62)
event.date_to = now() - timedelta(days=62)
event.date_from = now() - timedelta(days=32)
event.date_to = now() - timedelta(days=32)
assert shred_constraints(event) is None
event.date_from = now() - timedelta(days=52)
event.date_to = now() - timedelta(days=52)
event.date_from = now() - timedelta(days=22)
event.date_to = now() - timedelta(days=22)
assert shred_constraints(event)
event.date_from = now() - timedelta(days=62)
event.date_to = now() - timedelta(days=52)
event.date_from = now() - timedelta(days=32)
event.date_to = now() - timedelta(days=22)
assert shred_constraints(event)
@pytest.mark.django_db
def test_shred_constraint_60_days_subevents(event):
def test_shred_constraint_30_days_subevents(event):
event.has_subevents = True
event.live = False
event.subevents.create(
date_from=now() - timedelta(days=62),
date_to=now() - timedelta(days=62)
date_from=now() - timedelta(days=32),
date_to=now() - timedelta(days=32)
)
assert shred_constraints(event) is None
event.subevents.create(
date_from=now() - timedelta(days=62),
date_to=now() - timedelta(days=52)
date_from=now() - timedelta(days=22),
date_to=now() - timedelta(days=32)
)
assert shred_constraints(event)