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

luci-mod-admin-full: fix wifi add and scan actions

Browse source 
Due to conversion to CBI, the inline forms are now nested and thus do not
work anymore.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-07-15 13:14:24 +02:00
parent f29b2a2652
commit f6ffc3d739
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua
View file

@ -78,18 +78,9 @@ local tpl_radio = tpl.Template(nil, [[
</div>
<div class="td middle cbi-section-actions">
<div>
<input type="button" class="cbi-button cbi-button-neutral" title="<%:Restart radio interface%>" value="<%:Restart%>" onclick="wifi_restart(event)" data-radio="<%=dev:name()%>" />
<form action="<%=url('admin/network/wireless_join')%>" method="post" class="inline">
<input type="hidden" name="device" value="<%=dev:name()%>" />
<input type="hidden" name="token" value="<%=token%>" />
<input type="submit" class="cbi-button cbi-button-action important" title="<%:Find and join network%>" value="<%:Scan%>" />
</form>
<form action="<%=url('admin/network/wireless_add')%>" method="post" class="inline">
<input type="hidden" name="device" value="<%=dev:name()%>" />
<input type="hidden" name="token" value="<%=token%>" />
<input type="submit" class="cbi-button cbi-button-add" title="<%:Provide new network%>" value="<%:Add%>" />
</form>
<input type="button" class="cbi-button cbi-button-neutral" title="<%:Restart radio interface%>" value="<%:Restart%>" data-radio="<%=dev:name()%>" onclick="wifi_restart(event)" />
<input type="submit" class="cbi-button cbi-button-action important" title="<%:Find and join network%>" value="<%:Scan%>" data-radio="<%=dev:name()%>" onclick="wifi_action(event, 'join')" />
<input type="submit" class="cbi-button cbi-button-add" title="<%:Provide new network%>" value="<%:Add%>" data-radio="<%=dev:name()%>" onclick="wifi_action(event, 'add')" />
</div>
</div>
</div>

8
modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm
View file

@ -26,6 +26,14 @@
{ token: '<%=token%>' }, XHR.run);
}
function wifi_action(ev, action) {
var i = ev.target,
e = i.getAttribute('data-radio');
i.parentNode.appendChild(E('input', { type: 'hidden', name: 'device', value: e }));
i.form.action = '<%=url('admin/network/wireless_')%>' + action;
}
var networks = [ ];
document.querySelectorAll('[data-network]').forEach(function(n) {