Merge with master #39

Merged
heinzel merged 61 commits from master into production 2020-12-22 19:45:12 +01:00
Showing only changes of commit fbcb8e5f4e - Show all commits

View File

@@ -96,13 +96,13 @@ def render_event_changelog(event):
icon = u'flag'
status = get_or_create_event_status(change.content)
content_html = format_html(raise_flag_templ,
bcontext=status.bootstrap_context,
bcontext=status.bootstrap_context or u'default',
label=status.label)
elif change.operation == EventChange.LOWER_FLAG:
icon = u'flag'
status = get_or_create_event_status(change.content)
content_html = format_html(lower_flag_templ,
bcontext=status.bootstrap_context,
bcontext=status.bootstrap_context or u'default',
label=status.label)
else:
icon = u'question-sign'