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

Merge pull request 'heinzel' (#42) from heinzel into master
Some checks failed
buildbot/tox Build done.
Details

Browse Source 
Reviewed-on: #42
This commit was merged in pull request #42.
This commit is contained in:
heinzel
2021-01-07 14:02:32 +01:00
parent c6943971b6 4890c2430f
commit 4b772e743b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dav_events/workflow.py
View File

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