diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-06-04 12:07:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 12:07:43 +0300 |
| commit | 4cd08258bbe145384145933e8f061351bc9a82ad (patch) | |
| tree | 75633ccf9867a9e01eeeb090a3b54b936ebac234 | |
| parent | 1ce88dced63d028f93fdf304b6ff0a48c4453655 (diff) | |
| parent | 09c3a8385e2176fc8a4f934e592f4089b662a1c1 (diff) | |
Merge pull request #1835 from Ansuel/ddns-optional
luci-app-ddns: make param opt, optional
| -rw-r--r-- | applications/luci-app-ddns/Makefile | 5 | ||||
| -rw-r--r-- | applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile index 886b266b0..729518951 100644 --- a/applications/luci-app-ddns/Makefile +++ b/applications/luci-app-ddns/Makefile @@ -16,10 +16,11 @@ PKG_VERSION:=2.4.9 # Release == build # increase on changes of translation files -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_LICENSE:=Apache-2.0 -PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com> +PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>, \ + Ansuel Smith <ansuelsmth@gmail.com> # LuCI specific settings LUCI_TITLE:=LuCI Support for Dynamic DNS Client (ddns-scripts) diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua index 10d39c718..eb2159076 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua @@ -172,7 +172,7 @@ local function _option_used(option, urlscript) end -- function to verify if option is valid -local function _option_validate(self, value) +local function _option_validate(self, value, optional) -- section is globally defined here be calling agrument (see above) local fusev6 = usev6:formvalue(section) or "0" local fsvc4 = svc4:formvalue(section) or "-" @@ -204,6 +204,7 @@ local function _option_validate(self, value) if used < 1 then return "" end -- needed but no data then return error if not value or (#value == 0) then + if optional then return nil end return nil, err_tab_basic(self) .. translate("missing / required") end return value @@ -513,18 +514,18 @@ pe = ns:taboption("basic", Value, "param_enc", translate("Optional Encoded Parameter"), translate("Optional: Replaces [PARAMENC] in Update-URL (URL-encoded)") ) function pe.validate(self, value) - return _option_validate(self, value) + return _option_validate(self, value, true) end function pe.parse(self, section, novld) DDNS.value_parse(self, section, novld) end --- IPv4/IPv6 - param_enc -- ################################################### +-- IPv4/IPv6 - param_opt -- ################################################### po = ns:taboption("basic", Value, "param_opt", translate("Optional Parameter"), translate("Optional: Replaces [PARAMOPT] in Update-URL (NOT URL-encoded)") ) function po.validate(self, value) - return _option_validate(self, value) + return _option_validate(self, value, true) end function po.parse(self, section, novld) DDNS.value_parse(self, section, novld) |