1 files changed, 13 insertions, 9 deletions
diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
index a3c9ed16b..abb6ce8d4 100644
--- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
+++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
@@ -76,9 +76,11 @@ function options_client(s, tab)
 	o.datatype = "port"
 end
 
-function options_server(s, tab)
+function options_server(s, opts)
 	local o
 	local optfunc
+	local tab = opts and opts.tab or nil
+	local row = opts and opts.row or false
 
 	if tab == nil then
 		optfunc = function(...) return s:option(...) end
@@ -96,13 +98,17 @@ function options_server(s, tab)
 	for _, m in ipairs(methods) do
 		o:value(m)
 	end
-	o = optfunc(Value, "key", translate("Key (base64)"))
-	o.datatype = "base64"
-	o.password = true
-	o.size = 12
 	o = optfunc(Value, "password", translate("Password"))
 	o.password = true
 	o.size = 12
+	if not row then
+		o = optfunc(Value, "key", translate("Key (base64)"))
+		o.datatype = "base64"
+		o.password = true
+		o.size = 12
+		optfunc(Value, "plugin", translate("Plugin"))
+		optfunc(Value, "plugin_opts", translate("Plugin Options"))
+	end
 end
 
 function options_common(s, tab)
@@ -117,8 +123,6 @@ function options_common(s, tab)
 	o.datatype = "uinteger"
 	o = s:taboption(tab, Value, "timeout", translate("Timeout (sec)"))
 	o.datatype = "uinteger"
-	s:taboption(tab, Value, "plugin", translate("Plugin"))
-	s:taboption(tab, Value, "plugin_opts", translate("Plugin Options"))
 	s:taboption(tab, Value, "user", translate("Run as"))
 
 	s:taboption(tab, Flag, "verbose", translate("Verbose"))
@@ -213,6 +217,8 @@ names_options_server = {
 	"method",
 	"key",
 	"password",
+	"plugin",
+	"plugin_opts",
 }
 
 names_options_client = {
@@ -230,8 +236,6 @@ names_options_common = {
 	"mode",
 	"mtu",
 	"timeout",
-	"plugin",
-	"plugin_opts",
 	"user",
 }