From 07de9190d87c0f355f8ba8e45c2de51ad9a01166 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 3 May 2018 08:24:15 +0200 Subject: [PATCH] Revert "luci-base: support hiding the "Back to Overview" button in cbi maps" This reverts commit 52cf265c9d12537d5f37043350328d30ca11bab4. I accidentally committed unrelated changes. Signed-off-by: Jo-Philipp Wich --- .../luasrc/model/cbi/travelmate/overview_tab.lua | 21 +++++++++------------ modules/luci-base/luasrc/view/cbi/footer.htm | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index e2f4e3f00..7b6b9658c 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -19,12 +19,8 @@ m = Map("travelmate", translate("Travelmate"), .. "" .. "see online documentation", "https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md")) --- We might modify these configs too: -m:chain("network") -m:chain("firewall") - function m.on_after_commit(self) - uci:apply(true) + luci.sys.call("env -i /etc/init.d/travelmate restart >/dev/null 2>&1") luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate")) end @@ -46,24 +42,25 @@ if uplink == "" then btn.disabled = false function btn.write(self, section) - -- Do uci changes. Note that we must not commit here as the rollback handler - -- needs to see "unsaved changes" in order to roll them back. local iface = o:formvalue(section) if iface then uci:set("travelmate", section, "trm_iface", iface) + uci:save("travelmate") + uci:commit("travelmate") local net = nw:add_network(iface, { proto = "dhcp" }) if net then + nw:save("network") + nw:commit("network") local zone = fw:get_zone_by_network("wan") if zone then zone:add_network(iface) + fw:save("firewall") + fw:commit("firewall") end end + luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1") end - - -- Since we're prematurely terminating the cbi logic flow here and since we trigger - -- our modifications in a button write callback and not via cbi.apply, we do need to - -- tell cbi to trigger apply/rollback. - m.flow.autoapply = true + luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate")) end return m end diff --git a/modules/luci-base/luasrc/view/cbi/footer.htm b/modules/luci-base/luasrc/view/cbi/footer.htm index e6acfb069..4d332fd07 100644 --- a/modules/luci-base/luasrc/view/cbi/footer.htm +++ b/modules/luci-base/luasrc/view/cbi/footer.htm @@ -1,6 +1,6 @@ <%- if pageaction then -%>
- <% if redirect and not flow.hidebackbtn then %> + <% if redirect then %>
-- 2.11.0