fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict with luci-app-filetransfer & luci-app-ssr-plus-jsda

Browse Source
This commit is contained in:
CN_SZTL 2019-07-16 16:39:26 +08:00
parent 3d743cf761
commit 5ef34d3dcc
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/client-config.lua
View File

@ -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

2
package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/server-config.lua
View File

@ -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

6
package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/other_dvalue.htm
View File

@ -1,6 +0,0 @@
<%+cbi/valueheader%>
<label class="cbi-value-title" style="display:inline-block; width: 180px" for="ulfile"><%:Choose local file:%></label>
<input class="cbi-input-file" style="width: 400px" type="file" id="ulfile" name="ulfile" />
<%+cbi/valuefooter%>

8
package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/ssr_other_dvalue.htm Normal file
View File

@ -0,0 +1,8 @@
<%+cbi/valueheader%>
<span style="color: red">
<%
local val = self:cfgvalue(section) or self.default or ""
write(pcdata(val))
%>
</span>
<%+cbi/valuefooter%>