luci-app-travelmate: small bugfixes & optimizations 1275/head
authorDirk Brenken <dev@brenken.org>
Thu, 3 Aug 2017 15:04:58 +0000 (17:04 +0200)
committerDirk Brenken <dev@brenken.org>
Thu, 3 Aug 2017 15:04:58 +0000 (17:04 +0200)
* various small bugfixes and optimizations

Signed-off-by: Dirk Brenken <dev@brenken.org>
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_delete.lua
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_order.lua
applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm

index 979307e0013b7f613575b194021f10134aeb921f..3f3f2348a7d214dc2d9ebe8c88ee154ebef117cf 100644 (file)
@@ -18,7 +18,7 @@ m.hidden = {
        device      = http.formvalue("device"),
        ssid        = http.formvalue("ssid"),
        wep         = http.formvalue("wep"),
-       wpa_suites      = http.formvalue("wpa_suites"),
+       wpa_suites  = http.formvalue("wpa_suites"),
        wpa_version = http.formvalue("wpa_version")
 }
 
@@ -45,11 +45,11 @@ end
 
 function wssid.write(self, section, value)
        newsection = uci:section("wireless", "wifi-iface", nil, {
-               mode       = "sta",
-               network    = trmiface,
-               device     = m.hidden.device,
-               ssid       = wssid:formvalue(section),
-               disabled   = "1"
+               mode     = "sta",
+               network  = trmiface,
+               device   = m.hidden.device,
+               ssid     = wssid:formvalue(section),
+               disabled = "1"
        })
        if (tonumber(m.hidden.wep) or 0) == 1 then
                uci:set("wireless", newsection, "encryption", "wep-open")
index 97ec1ca3caa069edd0045335097cbb49a0d1b7d0..0c3cc1865bdc271dc1800b89821c58a8afe75896 100644 (file)
@@ -10,5 +10,4 @@ if cfg ~= nil then
        uci:save("wireless")
        uci:commit("wireless")
 end
-
 http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))
index 0bae98460fba3986b88197255b4616dc820dde5b..b0a77e4865afb41c3c82d94ea4f40f47a9ab21f5 100644 (file)
@@ -21,7 +21,6 @@ local s = uci:get_all("wireless", m.hidden.cfg)
 if s ~= nil then
        wssid = m:field(Value, "ssid", translate("SSID"))
        wssid.default = s.ssid
-       
        if s.encryption and s.key then
                wkey = m:field(Value, "key", translatef("Passphrase (%s)", s.encryption))
                wkey.password = true
@@ -33,7 +32,7 @@ if s ~= nil then
                end
        end
 else
-       http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))
+       m.on_cancel()
 end
 
 function wssid.write(self, section, value)
@@ -43,7 +42,7 @@ function wssid.write(self, section, value)
        end
        uci:save("wireless")
        uci:commit("wireless")
-       http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))
+       m.on_cancel()
 end
 
 return m
index d53e1f55e59c82d380f5be9d5011289f2675e6d5..5b6141e52d39b246f500f8ac5cf8a2522027f559 100644 (file)
@@ -12,40 +12,26 @@ if cfg ~= nil then
        local section = ""
        local idx = ""
        local idx_change = ""
-       if dir == "up" then
-               uci:foreach("wireless", "wifi-iface", function(s)
-                       iface = s.network
-                       if iface == trmiface then
-                               section = s['.name']
-                               if cfg == section then
-                                       idx = s['.index']
-                               else
-                                       idx_change = s['.index']
-                               end
-                               if idx ~= "" and idx_change ~= "" and idx_change < idx then
-                                       uci:reorder("wireless", cfg, idx_change)
-                                       idx = ""
-                               end
+       local changed = ""
+       uci:foreach("wireless", "wifi-iface", function(s)
+               iface = s.network
+               if iface == trmiface then
+                       section = s['.name']
+                       if cfg == section then
+                               idx = s['.index']
+                       else
+                               idx_change = s['.index']
                        end
-               end)
-       elseif dir == "down" then
-               uci:foreach("wireless", "wifi-iface", function(s)
-                       iface = s.network
-                       if iface == trmiface then
-                               section = s['.name']
-                               if cfg == section then
-                                       idx = s['.index']
-                               else
-                                       idx_change = s['.index']
-                               end
-                               if idx ~= "" and idx_change ~= "" and idx_change > idx then
-                                       uci:reorder("wireless", cfg, idx_change)
-                                       idx = ""
-                               end
+                       if (dir == "up" and idx ~= "" and idx_change ~= "" and idx_change < idx) or
+                               (dir == "down" and idx ~= "" and idx_change ~= "" and idx_change > idx) then
+                               changed = uci:reorder("wireless", cfg, idx_change)
+                               idx = ""
                        end
-               end)
+               end
+       end)
+       if changed ~= "" then
+               uci:save("wireless")
+               uci:commit("wireless")
        end
-       uci:save("wireless")
-       uci:commit("wireless")
 end
 http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))
index f1f26801ce4a3a63577530817891aeb4dcd3a493..41c9f5267da1112b6526bf460355a4e5bddf0d69 100644 (file)
@@ -53,7 +53,7 @@ This is free software, licensed under the Apache License, Version 2.0
         <input type="button" class="cbi-button cbi-button-remove" onclick="location.href='<%=url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/>
       </td>
     </tr>
-<% 
+<%
     end
   end)
 %>