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 23a94a153d338fa042b048ecc5be0dccc467b063..01f18dae4a426571df35deee7320d844d6da3b91 100644 (file)
--- 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 151103f7bdecd77565e966a210fb78e530166409..97f28bd325eaf9ceb87c0230490479d312f7ad3a 100644 (file)
--- 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 "—"
-               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 "—"
-       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 "—"
        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