Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1270 from dibdot/travelmate

Browse source 
luci-app-travelmate: rework wireless station re-ordering
This commit is contained in:
Hannu Nyman 2017-08-01 09:20:18 +03:00 committed by GitHub
commit 7387bf619f
2 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_order.lua
View file

@ -1,22 +1,51 @@
-- Copyright 2017 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
local uci = require("luci.model.uci").cursor()
local http = require("luci.http")
local cfg = http.formvalue("cfg")
local pos = http.formvalue("pos")
local dir = http.formvalue("dir")
local uci = require("luci.model.uci").cursor()
local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan"
if cfg ~= nil then
local iface = ""
local section = ""
local idx = ""
local idx_change = ""
if dir == "up" then
pos = pos - 1
uci:reorder("wireless", cfg, pos)
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
end
end)
elseif dir == "down" then
pos = pos + 1
uci:reorder("wireless", cfg, pos)
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
end
end)
end
uci:save("wireless")
uci:commit("wireless")
end
http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))

13
applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
View file

@ -26,16 +26,12 @@ This is free software, licensed under the Apache License, Version 2.0
<th class="cbi-section-table-cell" style="text-align:center" colspan="2"><%:Actions%></th>
</tr>
<%
local pos = -1
uci:foreach("wireless", "wifi-device", function(s)
pos = pos + 1
end)
uci:foreach("wireless", "wifi-iface", function(s)
pos = pos + 1
local iface = s.network or ""
if iface == trmiface then
local section = s['.name']
local device = s.device or ""
local mode = s.mode or ""
local iface = s.network or ""
local ssid = s.ssid or ""
local encryption = s.encryption or ""
local disabled = s.disabled or ""
@ -43,15 +39,14 @@ This is free software, licensed under the Apache License, Version 2.0
if disabled == "0" then
style = "color:#0069d6;font-weight:bold"
end
if iface == trmiface then
%>
<tr class="cbi-section-table-row cbi-rowstyle-1" style="<%=style%>">
<td style="text-align:left"><%=device%></td>
<td style="text-align:left"><%=ssid%></td>
<td style="text-align:left"><%=encryption%></td>
<td class="cbi-value-field" style="width:70px;text-align:right">
<input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;pos=<%=pos%>;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/>
<input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;pos=<%=pos%>;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
<input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=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='<%=url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
</td>
<td class="cbi-value-field" style="width:150px;text-align:right">
<input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/>