diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-07-15 13:14:24 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-07-15 13:14:24 +0200 |
| commit | f6ffc3d739ef48c3186b3313e2480c8787f42fcd (patch) | |
| tree | 3a901ac8b1e93d169f4a721b0f69566108467d4d | |
| parent | f29b2a2652efeb6c0fb21edbff0b1ea0326d380a (diff) | |
luci-mod-admin-full: fix wifi add and scan actions
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>
| -rw-r--r-- | modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua | 15 | ||||
| -rw-r--r-- | modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm | 8 |
2 files changed, 11 insertions, 12 deletions
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua index dda31fb1e..dcd03cb0f 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua @@ -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> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm index 9730bc2c9..cc6db1721 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm @@ -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) { |