From 4e80499a023fb195c7c897841473f526ffd0c7fa Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 5 Aug 2017 18:57:20 +0200 Subject: [PATCH] luci-app-travelmate: bugfix * fix bug in interface wizard during initial setup * cosmetics Signed-off-by: Dirk Brenken --- .../luasrc/model/cbi/travelmate/cfg_firewall_tab.lua | 1 + .../luasrc/model/cbi/travelmate/cfg_network_tab.lua | 1 + .../luasrc/model/cbi/travelmate/cfg_wireless_tab.lua | 1 + .../luasrc/model/cbi/travelmate/configuration_tab.lua | 1 + .../luasrc/model/cbi/travelmate/overview_tab.lua | 13 +++++-------- .../luasrc/model/cbi/travelmate/wifi_add.lua | 1 + .../luasrc/model/cbi/travelmate/wifi_edit.lua | 1 + .../luasrc/view/travelmate/wifi_scan.htm | 6 +++--- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua index 009ed805d..e5a048fa8 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua @@ -12,6 +12,7 @@ end m = SimpleForm("input", nil) m:append(Template("travelmate/config_css")) +m.submit = translate("Save") m.reset = false s = m:section(SimpleSection, nil, diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua index 4d43637d9..0096d6a8c 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua @@ -12,6 +12,7 @@ end m = SimpleForm("input", nil) m:append(Template("travelmate/config_css")) +m.submit = translate("Save") m.reset = false s = m:section(SimpleSection, nil, diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua index a025c1379..7ef9920a0 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua @@ -12,6 +12,7 @@ end m = SimpleForm("input", nil) m:append(Template("travelmate/config_css")) +m.submit = translate("Save") m.reset = false s = m:section(SimpleSection, nil, diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua index 4233da6ac..8a20ab9cc 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua @@ -14,6 +14,7 @@ end m = SimpleForm("input", nil) m:append(Template("travelmate/config_css")) +m.submit = translate("Save") m.reset = false s = m:section(SimpleSection, nil, 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 12cb72cbe..b16fb4161 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 @@ -35,20 +35,17 @@ if uplink == "" then o.default = "trm_wwan" o.rmempty = false - function o.write(self, section, value) - iface = o:formvalue(section) - uci:set("travelmate", section, "trm_iface", iface) - uci:save("travelmate") - uci:commit("travelmate") - end - btn = s:option(Button, "", 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() + function btn.write(self, section, value) + iface = o:formvalue(section) + 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") diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua index 3f3f2348a..dcfa17c8b 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua @@ -7,6 +7,7 @@ local http = require("luci.http") local trmiface = uci.get("travelmate", "global", "trm_iface") or "trm_wwan" m = SimpleForm("add", translate("Add Wireless Uplink Configuration")) +m.submit = translate("Save") m.cancel = translate("Back to overview") m.reset = false diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua index b0a77e486..6d6bdcff4 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua @@ -6,6 +6,7 @@ local uci = require("luci.model.uci").cursor() local http = require("luci.http") m = SimpleForm("edit", translate("Edit Wireless Uplink Configuration")) +m.submit = translate("Save") m.cancel = translate("Back to overview") m.reset = false diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm index dea107eef..b3907e864 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm @@ -76,14 +76,14 @@ This is free software, licensed under the Apache License, Version 2.0
-
- -
+
+ +
-- 2.11.0