DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

FIX #3a538e45bf
All checks were successful
buildbot/tox Build done.
Details

Browse Source
This commit is contained in:
heinzel
2021-01-07 13:48:31 +01:00
parent 3a538e45bf
commit 4890c2430f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dav_events/workflow.py
View File

@@ -266,23 +266,21 @@ class BasicWorkflow(object):
heaviest_flag = event.flags.order_by('status').last() heaviest_flag = event.flags.order_by('status').last()
if heaviest_flag: if heaviest_flag:
flags = []
last_status = heaviest_flag.status last_status = heaviest_flag.status
if last_status.code.startswith('publishing_'): if last_status.code.startswith('publishing_'):
flags = []
flags += event.flags.filter(status__code='accepted') flags += event.flags.filter(status__code='accepted')
flags += heaviest_flag flags.append(heaviest_flag)
elif last_status.code.startswith('published_'): elif last_status.code.startswith('published_'):
flags = []
if event.flags.filter(status__code='publishing').exists(): if event.flags.filter(status__code='publishing').exists():
flags += event.flags.filter(status__code='publishing') flags += event.flags.filter(status__code='publishing')
else: else:
flags += event.flags.filter(status__code='accepted') flags += event.flags.filter(status__code='accepted')
flags += heaviest_flag flags.append(heaviest_flag)
elif last_status.code.startswith('clear'): elif last_status.code.startswith('clear'):
flags = [heaviest_flag] flags += event.flags.filter(status__code__in=('cleared', 'canceled', 'realized'))
flags += event.flags.filter(status__code__in=('canceled', 'realized'))
else: else:
flags = [heaviest_flag] flags.append(heaviest_flag)
deferred_publishing = event.planned_publication_date and event.planned_publication_date > today deferred_publishing = event.planned_publication_date and event.planned_publication_date > today
add_publishing_date = False add_publishing_date = False