From 5ef34d3dccd8e6ec5d0a9e34f4f52570dd2b6df1 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 16 Jul 2019 16:39:26 +0800 Subject: [PATCH] resolve conflict with luci-app-filetransfer & luci-app-ssr-plus-jsda --- .../luasrc/model/cbi/shadowsocksr/client-config.lua | 2 +- .../luasrc/model/cbi/shadowsocksr/server-config.lua | 2 +- .../luasrc/view/cbi/other_dvalue.htm | 6 ------ .../luasrc/view/cbi/ssr_other_dvalue.htm | 8 ++++++++ 4 files changed, 10 insertions(+), 8 deletions(-) delete mode 100755 package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/other_dvalue.htm create mode 100644 package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/ssr_other_dvalue.htm diff --git a/package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/client-config.lua index d1f424630a..aead0253ee 100755 --- a/package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -147,7 +147,7 @@ upload_conf.template = "cbi/ssr_other_upload2" upload_conf:depends("use_conf_file", 1) um = s:option(DummyValue, "", nil) -um.template = "cbi/other_dvalue" +um.template = "cbi/ssr_other_dvalue" um:depends("use_conf_file", 1) local conf_dir, fd diff --git a/package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/server-config.lua b/package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/server-config.lua index 39bf5f1c0c..b403dd683f 100755 --- a/package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/server-config.lua +++ b/package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/server-config.lua @@ -108,7 +108,7 @@ upload_conf.template = "cbi/ssr_other_upload2" upload_conf:depends("use_conf_file", 1) um = s:option(DummyValue, "", nil) -um.template = "cbi/other_dvalue" +um.template = "cbi/ssr_other_dvalue" um:depends("use_conf_file", 1) local conf_dir, fd diff --git a/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/other_dvalue.htm b/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/other_dvalue.htm deleted file mode 100755 index 322616d71a..0000000000 --- a/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/other_dvalue.htm +++ /dev/null @@ -1,6 +0,0 @@ -<%+cbi/valueheader%> - - - - -<%+cbi/valuefooter%> diff --git a/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/ssr_other_dvalue.htm b/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/ssr_other_dvalue.htm new file mode 100644 index 0000000000..39e23e573a --- /dev/null +++ b/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/ssr_other_dvalue.htm @@ -0,0 +1,8 @@ +<%+cbi/valueheader%> + + <% + local val = self:cfgvalue(section) or self.default or "" + write(pcdata(val)) + %> + +<%+cbi/valuefooter%>