diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-07-18 10:02:07 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-07-18 12:05:05 +0200 |
| commit | 90f9c59a2d392837bbef39b5acf402531ab2d9be (patch) | |
| tree | 3f8f35c9e0091dc12cf4eeacadea823509088fb1 | |
| parent | c09e1545608c9db5d9a81f7275528a6fc0a79505 (diff) | |
luci-mod-admin-full: properly reset internal device form field
In some cases the hidden internal device field was not reset, e.g. after
aborting a wifi scan and using the browser back buttons to navigate to the
overview page again.
In such a case, the previous device hidden field was still present and a new
one getting created, causing further wireless scan attempts to get invoked
with multiple radio names as parameter which fails.
Fix this issue by using the new generic cbi_submit() helper any by dropping
the faulty wifi_action() function.
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 | 4 | ||||
| -rw-r--r-- | modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm | 8 |
2 files changed, 2 insertions, 10 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 dcd03cb0f..32bf1965f 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 @@ -79,8 +79,8 @@ local tpl_radio = tpl.Template(nil, [[ <div class="td middle cbi-section-actions"> <div> <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')" /> + <input type="button" class="cbi-button cbi-button-action important" title="<%:Find and join network%>" value="<%:Scan%>" onclick="cbi_submit(this, 'device', '<%=dev:name()%>', '<%=url('admin/network/wireless_join')%>')" /> + <input type="button" class="cbi-button cbi-button-add" title="<%:Provide new network%>" value="<%:Add%>" onclick="cbi_submit(this, 'device', '<%=dev:name()%>', '<%=url('admin/network/wireless_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 cc6db1721..9730bc2c9 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,14 +26,6 @@ { 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) { |