Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4157 from Ansuel/fixddns

Browse source 
luci-app-ddns: Fix broken Custom provider select #4150
This commit is contained in:
Jo-Philipp Wich 2020-06-10 22:22:06 +02:00 committed by GitHub
commit f20fafb7a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js
View file

@ -511,7 +511,14 @@ return view.extend({
o.value('-',"-- " + _("custom") + " --"); o.value('-',"-- " + _("custom") + " --");
o.cfgvalue = function(section_id) { o.cfgvalue = function(section_id) {
return uci.get('ddns', section_id, 'service_name'); var service = uci.get('ddns', section_id, 'service_name'),
update_script = uci.get('ddns', section_id, 'update_script'),
update_url = uci.get('ddns', section_id, 'update_url');
if (!service && (update_script || update_url))
return "-";
return service;
} }
o.write = function(section_id, formvalue) { o.write = function(section_id, formvalue) {
@ -529,19 +536,41 @@ return view.extend({
_("Update URL to be used for updating your DDNS Provider." + "<br />" + _("Update URL to be used for updating your DDNS Provider." + "<br />" +
"Follow instructions you will find on their WEB page.")); "Follow instructions you will find on their WEB page."));
o.modalonly = true; o.modalonly = true;
o.rmempty = false; o.rmempty = true;
o.optional = true;
o.depends("ipv6_service_name","-"); o.depends("ipv6_service_name","-");
o.depends("ipv4_service_name","-"); o.depends("ipv4_service_name","-");
o.validate = function(section_id, value) {
var other = this.section.children.filter(function(o) { return o.option == 'update_script' })[0].formvalue(section_id);
if ((value == "" && other == "") || (value != "" && other != "")) {
return _("Insert a Update Script OR a Update URL");
}
return true;
}
// update_script // update_script
o = s.taboption('basic', form.Value, 'update_script', _("Custom update-script"), o = s.taboption('basic', form.Value, 'update_script', _("Custom update-script"),
_("Custom update script to be used for updating your DDNS Provider.")); _("Custom update script to be used for updating your DDNS Provider."));
o.modalonly = true; o.modalonly = true;
o.rmempty = false; o.rmempty = true;
o.optional = true;
o.depends("ipv6_service_name","-"); o.depends("ipv6_service_name","-");
o.depends("ipv4_service_name","-"); o.depends("ipv4_service_name","-");
o.validate = function(section_id, value) {
var other = this.section.children.filter(function(o) { return o.option == 'update_url' })[0].formvalue(section_id);
if ((value == "" && other == "") || (value != "" && other != "")) {
return _("Insert a Update Script OR a Update URL");
}
return true;
}
// domain // domain
o = s.taboption('basic', form.Value, 'domain', _("Domain"), o = s.taboption('basic', form.Value, 'domain', _("Domain"),