entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

backoffice: do not crash on status without a colour (#18488)

This commit is contained in:
Frédéric Péters 2017-09-06 11:21:49 +02:00
parent 517266fe6d
commit d5ba994201
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wcs/admin/workflows.py
View File

@ -707,7 +707,7 @@ class WorkflowStatusPage(Directory):
self.status.visibility = self.workflow.roles.keys()
else:
self.status.visibility = None
self.status.colour = form.get_widget('colour').parse()
self.status.colour = form.get_widget('colour').parse() or 'ffffff'
self.status.extra_css_class = form.get_widget('extra_css_class').parse()
self.workflow.store()
return redirect('.')

3
wcs/backoffice/management.py
View File

@ -1963,7 +1963,8 @@ class FormBackOfficeStatusPage(FormStatusPage):
try:
status_colour = formdata.get_status().colour
except AttributeError:
status_colour = 'ffffff'
status_colour = None
status_colour = status_colour or 'ffffff'
fg_colour = misc.get_foreground_colour(status_colour)
r += htmltext('<p class="current-status"><span class="item" style="background: #%s; color: %s;"></span>' %