From 782dd5fbd58f88a6dece648ad7106e058252005c Mon Sep 17 00:00:00 2001 From: janson Date: Tue, 28 Jun 2022 19:37:06 +0800 Subject: [PATCH] better to support enumNames --- .../luci-app-jellyfin/luasrc/controller/jellyfin.lua | 7 ------- .../luasrc/controller/kodexplorer.lua | 9 ++++++--- .../luci-app-wxedge/luasrc/controller/wxedge.lua | 9 ++++++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/applications/luci-app-jellyfin/luasrc/controller/jellyfin.lua b/applications/luci-app-jellyfin/luasrc/controller/jellyfin.lua index 6eb91cf..aac58e9 100755 --- a/applications/luci-app-jellyfin/luasrc/controller/jellyfin.lua +++ b/applications/luci-app-jellyfin/luasrc/controller/jellyfin.lua @@ -276,10 +276,3 @@ function blocks() return vals end -function dup_array(a) - local a2 = {} - for _, val in pairs(a) do - table.insert(a2, val) - end - return a2 -end diff --git a/applications/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua b/applications/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua index 0cb5ff0..9391c86 100755 --- a/applications/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua +++ b/applications/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua @@ -137,8 +137,8 @@ function main_container(data) required = true, title = "存储位置:", type = "string", - enum = dup_array(data.blocks), - enumNames = dup_array(data.blocks) + enum = dup_to_enums(data.blocks), + enumNames = dup_to_enums(data.blocks) }, }, description = "请选择合适的存储位置进行安装:", @@ -264,7 +264,10 @@ function blocks() return vals end -function dup_array(a) +function dup_to_enums(a) + if #a == 0 then + return nil + end local a2 = {} for _, val in pairs(a) do table.insert(a2, val) diff --git a/applications/luci-app-wxedge/luasrc/controller/wxedge.lua b/applications/luci-app-wxedge/luasrc/controller/wxedge.lua index 9ef47f0..5ce2278 100755 --- a/applications/luci-app-wxedge/luasrc/controller/wxedge.lua +++ b/applications/luci-app-wxedge/luasrc/controller/wxedge.lua @@ -128,8 +128,8 @@ function main_container(data) required = true, title = "实例1的存储位置:", type = "string", - enum = dup_array(data.blocks), - enumNames = dup_array(data.blocks) + enum = dup_to_enums(data.blocks), + enumNames = dup_to_enums(data.blocks) }, }, description = "请选择合适的存储位置进行安装:", @@ -254,7 +254,10 @@ function blocks() return vals end -function dup_array(a) +function dup_to_enums(a) + if #a == 0 then + return nil + end local a2 = {} for _, val in pairs(a) do table.insert(a2, val)