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

Merge with master #39

Merged
heinzel merged 61 commits from master into production 2020-12-22 19:45:12 +01:00
Conversation 0 Commits 61 Files Changed 70 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f2f0df3ab3 - Show all commits

4
dav_events/templatetags/dav_events.py
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'