pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix incompatibility with non-ASCII strings in wizard sorting

Browse source
This commit is contained in:
Gina Häußge 2017-07-26 16:46:15 +02:00
parent d59ef5c711
commit a9b6edde2b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/server/views.py
View file

@ -21,6 +21,7 @@ from octoprint.server import app, userManager, pluginManager, gettext, \
NOT_MODIFIED
from octoprint.settings import settings
from octoprint.filemanager import get_all_extensions
from octoprint.util import to_unicode
import re
import base64
@ -466,7 +467,7 @@ def _process_templates():
tab=dict(add="append", key="name"),
settings=dict(add="custom_append", key="name", custom_add_entries=lambda missing: dict(section_plugins=(gettext("Plugins"), None)), custom_add_order=lambda missing: ["section_plugins"] + missing),
usersettings=dict(add="append", key="name"),
wizard=dict(add="append", key="name", key_extractor=lambda d, k: "0:{}".format(d[0]) if "mandatory" in d[1] and d[1]["mandatory"] else "1:{}".format(d[0])),
wizard=dict(add="append", key="name", key_extractor=lambda d, k: u"0:{}".format(to_unicode(d[0])) if "mandatory" in d[1] and d[1]["mandatory"] else u"1:{}".format(to_unicode(d[0]))),
about=dict(add="append", key="name"),
generic=dict(add="append", key=None)
)