spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix only wlan0 being enabled by default

pull/379/head
Connor Rigby 2017-12-08 09:55:44 -08:00
parent bd490b7975
commit f697578b14
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nerves/target/bootstrap/configurator/router.ex
View File

@ -47,15 +47,15 @@ defmodule Farmbot.Target.Bootstrap.Configurator.Router do
info = [
interfaces: Map.new(interfaces, fn iface ->
enabled = if iface == "wlan0" do
1
checked = if iface == "wlan0" do
"checked"
else
0
""
end
if String.first(iface) == "w" do
{iface, %{type: :wireless, ssids: do_iw_scan(iface), enabled: enabled}}
{iface, %{type: :wireless, ssids: do_iw_scan(iface), checked: checked}}
else
{iface, %{type: :wired, enabled: enabled}}
{iface, %{type: :wired, checked: checked}}
end
end)
]

8
priv/static/templates/network.html.eex
View File

@ -36,17 +36,17 @@
<form action="configure_network" method="post">
<%= for {interface, settings} <- interfaces do %>
<%= case settings do %>
<% %{type: :wired, enabled: default} -> %>
<% %{type: :wired, checked: checked} -> %>
<fieldset>
<label>Enable Ethernet (<%= interface %>)</label>
<input checked="<%= default %>" type=checkbox name="<%= interface %>_enable">
<input <%= checked %> type=checkbox name="<%= interface %>_enable">
<input hidden=true name="<%= interface %>_type" value=wired>
</fieldset>
<% %{type: :wireless, ssids: ssids, enabled: default} -> %>
<% %{type: :wireless, ssids: ssids, checked: checked} -> %>
<fieldset>
<label>Enable Wireless (<%= interface %>) </label>
<input checked="<%= default %>" type=checkbox name="<%= interface %>_enable">
<input <%= checked %> type=checkbox name="<%= interface %>_enable">
<label>Network Name/SSID</label>
<select name="<%= interface %>_ssid" id="<%= interface %>_ssid_select" onchange="ssidSelectOnChange('<%= interface %>');">
<%= Enum.reduce(ssids, "", fn(ssid, acc) ->