From e40282cb382987b3d3e223c8f158924044283f71 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 11 Jan 2018 14:10:01 +0100 Subject: [PATCH] luci-app-mwan3: remove configuration tab remove configuration tab Signed-off-by: Florian Eckert --- .../luasrc/controller/mwan3.lua | 20 +++++++++---------- .../luasrc/model/cbi/mwan/interface.lua | 4 ++-- .../luasrc/model/cbi/mwan/interfaceconfig.lua | 2 +- .../luasrc/model/cbi/mwan/member.lua | 4 ++-- .../luasrc/model/cbi/mwan/memberconfig.lua | 2 +- .../luasrc/model/cbi/mwan/policy.lua | 4 ++-- .../luasrc/model/cbi/mwan/policyconfig.lua | 2 +- .../luasrc/model/cbi/mwan/rule.lua | 4 ++-- .../luasrc/model/cbi/mwan/ruleconfig.lua | 2 +- 9 files changed, 21 insertions(+), 23 deletions(-) diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index e8c818ee3d..f429cc60ff 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -33,27 +33,25 @@ function index() entry({"admin", "network", "mwan"}, - alias("admin", "network", "mwan", "configuration"), + alias("admin", "network", "mwan", "interface"), _("Load Balancing"), 600) - entry({"admin", "network", "mwan", "configuration"}, - alias("admin", "network", "mwan", "configuration", "interface"), - _("Configuration"), 20) - entry({"admin", "network", "mwan", "configuration", "globals"}, - cbi("mwan/globalsconfig"),_("Globals"), 5).leaf = true - entry({"admin", "network", "mwan", "configuration", "interface"}, + entry({"admin", "network", "mwan", "globals"}, + cbi("mwan/globalsconfig"), + _("Globals"), 5).leaf = true + entry({"admin", "network", "mwan", "interface"}, arcombine(cbi("mwan/interface"), cbi("mwan/interfaceconfig")), _("Interfaces"), 10).leaf = true - entry({"admin", "network", "mwan", "configuration", "member"}, + entry({"admin", "network", "mwan", "member"}, arcombine(cbi("mwan/member"), cbi("mwan/memberconfig")), _("Members"), 20).leaf = true - entry({"admin", "network", "mwan", "configuration", "policy"}, + entry({"admin", "network", "mwan", "policy"}, arcombine(cbi("mwan/policy"), cbi("mwan/policyconfig")), _("Policies"), 30).leaf = true - entry({"admin", "network", "mwan", "configuration", "rule"}, + entry({"admin", "network", "mwan", "rule"}, arcombine(cbi("mwan/rule"), cbi("mwan/ruleconfig")), _("Rules"), 40).leaf = true - entry({"admin", "network", "mwan", "configuration", "notify"}, + entry({"admin", "network", "mwan", "notify"}, cbi("mwan/notify"), _("Notification"), 50).leaf = true end 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 5ee5fb39f3..77198d5c39 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua @@ -114,11 +114,11 @@ mwan_interface = m5:section(TypedSection, "interface", translate("Interfaces"), mwan_interface.sectionhead = translate("Interface") mwan_interface.sortable = false mwan_interface.template = "cbi/tblsection" - mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "interface", "%s") + mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "interface", "%s") function mwan_interface.create(self, section) TypedSection.create(self, section) m5.uci:save("mwan3") - luci.http.redirect(dsp.build_url("admin", "network", "mwan", "configuration", "interface", section)) + luci.http.redirect(dsp.build_url("admin", "network", "mwan", "interface", section)) end diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua index a7d7c5af7e..86e959771e 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -89,7 +89,7 @@ interfaceCheck() m5 = Map("mwan3", translatef("MWAN Interface Configuration - %s", arg[1]), interfaceWarnings()) - m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "interface") + m5.redirect = dsp.build_url("admin", "network", "mwan", "interface") mwan_interface = m5:section(NamedSection, arg[1], "interface", "") diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua index efbe8f7902..b73ee57652 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua @@ -16,11 +16,11 @@ mwan_member = m5:section(TypedSection, "member", translate("Members"), mwan_member.sectionhead = translate("Member") mwan_member.sortable = true mwan_member.template = "cbi/tblsection" - mwan_member.extedit = ds.build_url("admin", "network", "mwan", "configuration", "member", "%s") + mwan_member.extedit = ds.build_url("admin", "network", "mwan", "member", "%s") function mwan_member.create(self, section) TypedSection.create(self, section) m5.uci:save("mwan3") - luci.http.redirect(ds.build_url("admin", "network", "mwan", "configuration", "member", section)) + luci.http.redirect(ds.build_url("admin", "network", "mwan", "member", section)) end diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua index dc2e0da447..220c4bddd6 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua @@ -15,7 +15,7 @@ arg[1] = arg[1] or "" m5 = Map("mwan3", translatef("MWAN Member Configuration - %s", arg[1])) - m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "member") + m5.redirect = dsp.build_url("admin", "network", "mwan", "member") mwan_member = m5:section(NamedSection, arg[1], "member", "") diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua index 6640564d50..495b45e646 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua @@ -45,11 +45,11 @@ mwan_policy = m5:section(TypedSection, "policy", translate("Policies"), mwan_policy.sectionhead = translate("Policy") mwan_policy.sortable = true mwan_policy.template = "cbi/tblsection" - mwan_policy.extedit = ds.build_url("admin", "network", "mwan", "configuration", "policy", "%s") + mwan_policy.extedit = ds.build_url("admin", "network", "mwan", "policy", "%s") function mwan_policy.create(self, section) TypedSection.create(self, section) m5.uci:save("mwan3") - luci.http.redirect(ds.build_url("admin", "network", "mwan", "configuration", "policy", section)) + luci.http.redirect(ds.build_url("admin", "network", "mwan", "policy", section)) end diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua index feb62dc8a3..cdf6521a79 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua @@ -34,7 +34,7 @@ policyCheck() m5 = Map("mwan3", translatef("MWAN Policy Configuration - %s", arg[1]), policyWarn()) - m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "policy") + m5.redirect = dsp.build_url("admin", "network", "mwan", "policy") mwan_policy = m5:section(NamedSection, arg[1], "policy", "") 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 9cb4756fc8..586f174b28 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua @@ -50,11 +50,11 @@ mwan_rule = m5:section(TypedSection, "rule", translate("Traffic Rules"), mwan_rule.sectionhead = translate("Rule") mwan_rule.sortable = true mwan_rule.template = "cbi/tblsection" - mwan_rule.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "rule", "%s") + mwan_rule.extedit = dsp.build_url("admin", "network", "mwan", "rule", "%s") function mwan_rule.create(self, section) TypedSection.create(self, section) m5.uci:save("mwan3") - luci.http.redirect(dsp.build_url("admin", "network", "mwan", "configuration", "rule", section)) + luci.http.redirect(dsp.build_url("admin", "network", "mwan", "rule", section)) end 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 cb1b45d261..87c4691af4 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua @@ -47,7 +47,7 @@ ruleCheck() m5 = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1]), ruleWarn()) - m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "rule") + m5.redirect = dsp.build_url("admin", "network", "mwan", "rule") mwan_rule = m5:section(NamedSection, arg[1], "rule", "") -- 2.30.2