From: Florian Eckert <fe@dev.tdt.de>
Date: Wed, 17 Jan 2018 14:22:57 +0000 (+0100)
Subject: luci-app-mwan3: remove some config parameter from rule overview table
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=de1afe2a90450d68e2e2c368fd888520e4ac3f7d

luci-app-mwan3: remove some config parameter from rule overview table

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
index 23a94a153..01f18dae4 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -130,9 +130,9 @@ enabled = mwan_interface:option(DummyValue, "enabled", translate("Enabled"))
 	enabled.rawhtml = true
 	function enabled.cfgvalue(self, s)
 		if self.map:get(s, "enabled") == "1" then
-			return "Yes"
+			return translate("Yes")
 		else
-			return "No"
+			return translate("No")
 		end
 	end
 
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
index 151103f7b..97f28bd32 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
@@ -90,54 +90,10 @@ proto = mwan_rule:option(DummyValue, "proto", translate("Protocol"))
 		return self.map:get(s, "proto") or "all"
 	end
 
-sticky = mwan_rule:option(DummyValue, "sticky", translate("Sticky"))
-	sticky.rawhtml = true
-	function sticky.cfgvalue(self, s)
-		if self.map:get(s, "sticky") == "1" then
-			stickied = 1
-			return translate("Yes")
-		else
-			stickied = nil
-			return translate("No")
-		end
-	end
-
-timeout = mwan_rule:option(DummyValue, "timeout", translate("Sticky timeout"))
-	timeout.rawhtml = true
-	function timeout.cfgvalue(self, s)
-		if stickied then
-			local timeoutValue = self.map:get(s, "timeout")
-			if timeoutValue then
-				return timeoutValue .. "s"
-			else
-				return "600s"
-			end
-		else
-			return "&#8212;"
-		end
-	end
-
-ipset = mwan_rule:option(DummyValue, "ipset", translate("IPset"))
-	ipset.rawhtml = true
-	function ipset.cfgvalue(self, s)
-		return self.map:get(s, "ipset") or "&#8212;"
-	end
-
 use_policy = mwan_rule:option(DummyValue, "use_policy", translate("Policy assigned"))
 	use_policy.rawhtml = true
 	function use_policy.cfgvalue(self, s)
 		return self.map:get(s, "use_policy") or "&#8212;"
 	end
 
-errors = mwan_rule:option(DummyValue, "errors", translate("Errors"))
-	errors.rawhtml = true
-	function errors.cfgvalue(self, s)
-		if not string.find(error_protocol_list, " " .. s .. " ") then
-			return ""
-		else
-			return "<span title=\"" .. translate("No protocol specified") .. "\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>"
-		end
-	end
-
-
 return m5