Revert "luci-base: support hiding the "Back to Overview" button in cbi maps"
This reverts commit 52cf265c9d
.
I accidentally committed unrelated changes.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
parent
52cf265c9d
commit
07de9190d8
2 changed files with 10 additions and 13 deletions
|
@ -19,12 +19,8 @@ m = Map("travelmate", translate("Travelmate"),
|
||||||
.. "<a href=\"%s\" target=\"_blank\">"
|
.. "<a href=\"%s\" target=\"_blank\">"
|
||||||
.. "see online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md"))
|
.. "see online documentation</a>", "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)
|
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"))
|
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate"))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -46,24 +42,25 @@ if uplink == "" then
|
||||||
btn.disabled = false
|
btn.disabled = false
|
||||||
|
|
||||||
function btn.write(self, section)
|
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)
|
local iface = o:formvalue(section)
|
||||||
if iface then
|
if iface then
|
||||||
uci:set("travelmate", section, "trm_iface", iface)
|
uci:set("travelmate", section, "trm_iface", iface)
|
||||||
|
uci:save("travelmate")
|
||||||
|
uci:commit("travelmate")
|
||||||
local net = nw:add_network(iface, { proto = "dhcp" })
|
local net = nw:add_network(iface, { proto = "dhcp" })
|
||||||
if net then
|
if net then
|
||||||
|
nw:save("network")
|
||||||
|
nw:commit("network")
|
||||||
local zone = fw:get_zone_by_network("wan")
|
local zone = fw:get_zone_by_network("wan")
|
||||||
if zone then
|
if zone then
|
||||||
zone:add_network(iface)
|
zone:add_network(iface)
|
||||||
|
fw:save("firewall")
|
||||||
|
fw:commit("firewall")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1")
|
||||||
end
|
end
|
||||||
|
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate"))
|
||||||
-- 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
|
|
||||||
end
|
end
|
||||||
return m
|
return m
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<%- if pageaction then -%>
|
<%- if pageaction then -%>
|
||||||
<div class="cbi-page-actions">
|
<div class="cbi-page-actions">
|
||||||
<% if redirect and not flow.hidebackbtn then %>
|
<% if redirect then %>
|
||||||
<div style="float:left">
|
<div style="float:left">
|
||||||
<input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" />
|
<input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" />
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue