From aae3d298c2a74d2f17887555bf7398c3de339b62 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 17 Jan 2018 16:05:25 +0100 Subject: luci-app-mwan3: refactoring warning compilation on the rule config pages Signed-off-by: Florian Eckert --- .../luasrc/model/cbi/mwan/ruleconfig.lua | 40 ++++------------------ 1 file changed, 6 insertions(+), 34 deletions(-) (limited to 'applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua') diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua index 812d46365f..4ff9f11673 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua @@ -1,23 +1,7 @@ --- ------ extra functions ------ -- - -function ruleCheck() -- determine if rule needs a protocol specified - local sourcePort = ut.trim(sys.exec("uci -p /var/state get mwan3." .. arg[1] .. ".src_port")) - local destPort = ut.trim(sys.exec("uci -p /var/state get mwan3." .. arg[1] .. ".dest_port")) - if sourcePort ~= "" or destPort ~= "" then -- ports configured - local protocol = ut.trim(sys.exec("uci -p /var/state get mwan3." .. arg[1] .. ".proto")) - if protocol == "" or protocol == "all" then -- no or improper protocol - error_protocol = 1 - end - end -end - -function ruleWarn() -- display warning message at the top of the page - if error_protocol == 1 then - return "" .. translate("WARNING: This rule is incorrectly configured with no or improper protocol specified! Please configure a specific protocol!") .. "" - else - return "" - end -end +dsp = require "luci.dispatcher" +sys = require "luci.sys" +ut = require "luci.util" +arg[1] = arg[1] or "" function cbiAddPolicy(field) uci.cursor():foreach("mwan3", "policy", @@ -34,20 +18,8 @@ function cbiAddProtocol(field) end end --- ------ rule configuration ------ -- - -dsp = require "luci.dispatcher" -sys = require "luci.sys" -ut = require "luci.util" -arg[1] = arg[1] or "" - -error_protocol = 0 -ruleCheck() - - -m5 = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1]), - ruleWarn()) - m5.redirect = dsp.build_url("admin", "network", "mwan", "rule") +m5 = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1])) +m5.redirect = dsp.build_url("admin", "network", "mwan", "rule") mwan_rule = m5:section(NamedSection, arg[1], "rule", "") -- cgit v1.2.3