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

Merge pull request 'UPD: display status flag canceled or realized also if cleared is set' (#41) from heinzel into master
All checks were successful
buildbot/tox Build done.
Details

Browse Source 
Reviewed-on: #41
This commit was merged in pull request #41.
This commit is contained in:
heinzel
2021-01-07 13:36:17 +01:00
parent 654fb6d220 e585f6057b
commit c6943971b6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dav_events/workflow.py
View File

@@ -266,16 +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 += event.flags.filter(status__code='accepted') flags = event.flags.filter(status__code='accepted')
flags.append(heaviest_flag)
elif last_status.code.startswith('published_'): elif last_status.code.startswith('published_'):
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.append(heaviest_flag) flags.append(heaviest_flag)
elif last_status.code.startswith('clear'):
flags = [heaviest_flag]
flags += event.flags.filter(status__code__in=('canceled', 'realized'))
else:
flags = [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