Merge pull request #1780 from dibdot/adblock

[project/luci.git] / applications / luci-app-travelmate / luasrc / model / cbi / travelmate / overview_tab.lua

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 e2f4e3f..f884649 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
@@ -18,13 +18,12 @@ m = Map("travelmate", translate("Travelmate"),
        .. translatef("For further information "
        .. "<a href=\"%s\" target=\"_blank\">"
        .. "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")
+m.apply_on_parse = true
 
-function m.on_after_commit(self)
-       uci:apply(true)
+function m.on_apply(self)
+       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
 
@@ -32,38 +31,25 @@ end
 
 if uplink == "" then
        ds = m:section(NamedSection, "global", "travelmate", translate("Interface Wizard"))
-
-       o = ds:option(Value, "", translate("Uplink interface"))
+       o = ds:option(Value, "trm_iface", translate("Create Uplink interface"),
+               translate("Create a new wireless wan uplink interface, configure it to use dhcp and ")
+               .. translate("add it to the wan zone of the firewall.<br />")
+               .. translate("This step has only to be done once."))
        o.datatype = "and(uciname,rangelength(3,15))"
        o.default = trmiface
        o.rmempty = false
 
-       btn = ds:option(Button, "trm_iface", translate("Create Uplink Interface"),
-               translate("Create a new wireless wan uplink interface, configure it to use dhcp and ")
-               .. translate("add it to the wan zone of the firewall. This step has only to be done once."))
-       btn.inputtitle = translate("Add Interface")
-       btn.inputstyle = "apply"
-       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)
-                       local net = nw:add_network(iface, { proto = "dhcp" })
+       function o.validate(self, value)
+               if value then
+                       local net = nw:add_network(value, { proto = "dhcp" })
                        if net then
                                local zone = fw:get_zone_by_network("wan")
                                if zone then
-                                       zone:add_network(iface)
+                                       zone:add_network(value)
                                end
                        end
                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
+               return value
        end
        return m
 end