From e7edcb40579aed5e5228c55e25dde31b4e49b37a Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Thu, 3 May 2018 07:53:48 +0200
Subject: luci-app-travelmate: support new workflow & re-ordering fix

* Remove SimpleForm stuff from Interface Wizard
* adapt Travelmate to support new cbi apply workflow
* fix station re-odering
* tested successfully with old & new workflow

Signed-off-by: Dirk Brenken <dev@brenken.org>
---
 .../luasrc/model/cbi/travelmate/overview_tab.lua   | 37 ++++++++--------------
 .../luasrc/view/travelmate/stations.htm            |  4 +--
 2 files changed, 15 insertions(+), 26 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 7b6b9658c..f8846493e 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
@@ -18,8 +18,11 @@ 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"))
+m:chain("network")
+m:chain("firewall")
+m.apply_on_parse = true
 
-function m.on_after_commit(self)
+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
@@ -28,39 +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)
-		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" })
+	function o.validate(self, value)
+		if value then
+			local net = nw:add_network(value, { 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")
+					zone:add_network(value)
 				end
 			end
-			luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1")
 		end
-		luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate"))
+		return value
 	end
 	return m
 end
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index 1dacb6e24..f76b52e9c 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@ -46,8 +46,8 @@ This is free software, licensed under the Apache License, Version 2.0
       <td style="<%=style%>"><%=bssid%></td>
       <td style="<%=style%>"><%=encryption%></td>
       <td class="cbi-value-field" style="width:80px">
-        <input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/>
-        <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
+        <input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/>
+        <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
       </td>
       <td class="cbi-value-field" style="width:150px">
         <input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/>
-- 
cgit v1.2.3