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

luci-app-mwan3: fix legacy uci api usage

Browse source 
Explicitely require libuci-lua in model classes that use legacy /var/state
cursor handling.

Also add a specific dependency on libuci-lua to the luci-app-mwan3
Makefile in preparation of the upcoming default removal of libuci-lua.

Finally fix the post data dispatching on the notification tab, see #1722
for reference.

Fixes #1726.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-04-06 09:35:39 +02:00
parent 24ac0d81ee
commit 08a2b27df5
5 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-mwan3/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for the MWAN3 multiwan hotplug script LUCI_TITLE:=LuCI support for the MWAN3 multiwan hotplug script
LUCI_DEPENDS:=+mwan3 +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio LUCI_DEPENDS:=+mwan3 +libuci-lua +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2

2
applications/luci-app-mwan3/luasrc/controller/mwan3.lua
View file

@ -56,7 +56,7 @@ function index()
arcombine(cbi("mwan/rule"), cbi("mwan/ruleconfig")), arcombine(cbi("mwan/rule"), cbi("mwan/ruleconfig")),
_("Rules"), 40).leaf = true _("Rules"), 40).leaf = true
entry({"admin", "network", "mwan", "notify"}, entry({"admin", "network", "mwan", "notify"},
cbi("mwan/notify"), form("mwan/notify"),
_("Notification"), 50).leaf = true _("Notification"), 50).leaf = true
end end

1
applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
View file

@ -3,6 +3,7 @@
-- Licensed to the public under the GNU General Public License v2. -- Licensed to the public under the GNU General Public License v2.
dsp = require "luci.dispatcher" dsp = require "luci.dispatcher"
uci = require "uci"
function interfaceWarnings(overview, count, iface_max) function interfaceWarnings(overview, count, iface_max)

1
applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
View file

@ -3,6 +3,7 @@
-- Licensed to the public under the GNU General Public License v2. -- Licensed to the public under the GNU General Public License v2.
dsp = require "luci.dispatcher" dsp = require "luci.dispatcher"
uci = require "uci"
function policyCheck() function policyCheck()

1
applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
View file

@ -3,6 +3,7 @@
-- Licensed to the public under the GNU General Public License v2. -- Licensed to the public under the GNU General Public License v2.
dsp = require "luci.dispatcher" dsp = require "luci.dispatcher"
uci = require "uci"
function ruleCheck() function ruleCheck()