luci-base: form: fix sort order bug triggered by integer types

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
openwrt · Nov 25, 2024 · fefb9ac · fefb9ac
1 parent 7b2d7ba
commit fefb9ac
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -3068,8 +3068,10 @@ var CBITableSection = CBITypedSection.extend(/** @lends LuCI.form.TableSection.p
 				n.classList.remove('flash')
 			});
 
+			val = Array.isArray(val) ? val.join(' '): val;
+			val = `${val}`; // coerce non-string types to string
 			list.push([
-				ui.Table.prototype.deriveSortKey((val != null) ? val.trim() : ''),
+				ui.Table.prototype.deriveSortKey((val != null && typeof val.trim === 'function') ? val.trim() : ''),
 				tr
 			]);
 		}, this));