🐛 Fix broken sv helper

OctoPrint · Oct 14, 2019 · ac3b6f6 · ac3b6f6
1 parent a889bec
commit ac3b6f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py
@@ -173,7 +173,9 @@ def finalize_fields(prefix, job):
 
 			return job
 
-		return sorted([util.dict_merge(dict(name=key), finalize_fields(key, value)) for key, value in jobs.items()], key=lambda x: sv(x["name"]))
+		return sorted([util.dict_merge(dict(name=key), finalize_fields(key, value))
+		               for key, value in jobs.items()],
+		              key=lambda x: sv(x["name"]))
 
 
 def delete_unrendered_timelapse(name):

diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py
@@ -74,7 +74,7 @@ def to_native_str(s_or_u):
 def sortable_value(value, default_value=""):
 	if value is None:
 		return default_value
-	return default_value
+	return value
 sv = sortable_value