From a256d3b4dea65af26117a3d2b60e058aa6fd40bd Mon Sep 17 00:00:00 2001 From: gitea-action Date: Mon, 24 Feb 2025 19:30:22 +0800 Subject: [PATCH] luci-app-nikki: sync upstream last commit: https://github.com/nikkinikki-org/OpenWrt-nikki/commit/f511e3e8802c93573ba6830663fd386e87365a02 --- luci-app-nikki/Makefile | 2 +- .../htdocs/luci-static/resources/view/nikki/mixin.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/luci-app-nikki/Makefile b/luci-app-nikki/Makefile index b6612d086..757e3de5d 100644 --- a/luci-app-nikki/Makefile +++ b/luci-app-nikki/Makefile @@ -1,6 +1,6 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.19.2 +PKG_VERSION:=1.19.3 LUCI_TITLE:=LuCI Support for nikki LUCI_DEPENDS:=+luci-base +nikki diff --git a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js index be335274b..692f7e1e9 100644 --- a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js +++ b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js @@ -158,6 +158,9 @@ return view.extend({ o.retain = true; o.depends('tun_gso', '1'); + o = s.taboption('tun', form.Flag, 'tun_endpoint_independent_nat', '*' + ' ' + _('Endpoint Independent NAT')); + o.rmempty = false; + o = s.taboption('tun', form.Flag, 'tun_dns_hijack', '*' + ' ' + _('Overwrite DNS Hijack')); o.rmempty = false; @@ -168,9 +171,6 @@ return view.extend({ o.value('tcp://any:53'); o.value('udp://any:53'); - o = s.taboption('tun', form.Flag, 'tun_endpoint_independent_nat', '*' + ' ' + _('Endpoint Independent NAT')); - o.rmempty = false; - s.tab('dns', _('DNS Config')); o = s.taboption('dns', form.Value, 'dns_port', '*' + ' ' + _('DNS Port'));