libs/cbi: fix bug in form prefill of zone picker widgets

[project/luci.git] / libs / cbi / luasrc / view / cbi / firewall_zonelist.htm

diff --git a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm b/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
index 7474b77..dcc14fb 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
+++ b/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
@@ -15,48 +15,76 @@ $Id$
 
 <%-
        local utl = require "luci.util"
-       local wba = require "luci.tools.webadmin"
-       local wbi = require "luci.tools.webadmin_interfaces"
        local fwm = require "luci.model.firewall"
+       local nwm = require "luci.model.network"
 
-       wbi.init(self.map.uci)
+       local zone, net, iface
+       local zones = fwm:get_zones()
+       local value = self:formvalue(section)
+       if not value or value == "-" then value = self:cfgvalue(section) or self.default end
 
-       local zone, iface, ifname
-       local zones = fwm.get_zones()
-       local value = self:cfgvalue(section) or self.default
+       local selected = false
+       local checked = { }
 
-       if value and #value == 0 then value = nil end
+       if value and #value == 0 then
+               value = nil
+       elseif type(value) == "table" then
+               for _, value in ipairs(value) do
+                       checked[value] = true
+               end
+       elseif value then
+               checked[value] = true           
+       end
 -%>
 
-<ul style="margin:0; list-style-type:none">
-       <% for _, zone in utl.spairs(zones, function(a,b) return (zones[a]:name() < zones[b]:name()) end) do %>
+<ul style="margin:0; list-style-type:none; text-align:left">
+       <%
+               for _, zone in utl.spairs(zones, function(a,b) return (zones[a]:name() < zones[b]:name()) end) do
+                       if zone:name() ~= self.exclude then
+                               selected = selected or (value == zone:name())
+       %>
        <li style="padding:0.5em">
-               <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "." .. zone:name()) .. attr("name", cbid) .. attr("value", zone:name()) .. ifattr(value == zone:name(), "checked", "checked")%> /> &nbsp;
+               <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "." .. zone:name()) .. attr("name", cbid) .. attr("value", zone:name()) .. ifattr(checked[zone:name()], "checked", "checked")%> /> &nbsp;
                <label<%=attr("for", cbid .. "." .. zone:name())%> style="background-color:<%=zone:get_color()%>; padding:0.5em">
                        <strong><%=zone:name()%>:</strong>
                        <%
-                               local empty = true
-                               for _, iface in ipairs(zone:get_networks()) do
-                                       local ifname = wbi.network_get_ifname(iface)
-                                       local dev    = wbi.iface_get_list()[ifname]
-                        %>
-                               <% if ifname and dev then empty = false %>
-                                       <img title="<%=wbi.iface_format_type(dev.type)%>" style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=dev.type or "ethernet"%><%=dev.flags and dev.flags.up and "" or "_disabled"%>.png" />
-                                       <% if iface == self.iface then %><strong><%=ifname%></strong><% else %><%=ifname%><% end %> &nbsp;
-                               <% end %>
-                       <% end %>
-                       <% if empty then %><em><%:a_s_ipt_zone_empty (no interfaces attached)%></em><% end %>
+                               local zempty = true
+                               for _, net in ipairs(zone:get_networks()) do
+                                       net = nwm:get_network(net)
+                                       zempty = false
+                                       if net then
+                                               local nempty = true
+                       %>
+                               &nbsp;
+                               <%- if net:name() == self.network then -%>
+                                       <span style="background-color:#FFFFFF; border:1px solid #000000; padding:2px; font-weight:bold"><%=net:name()%>:
+                               <%- else -%>
+                                       <span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>:
+                               <%- end -%>
+                               <%
+                                       for _, iface in ipairs(net and net:get_interfaces() or {}) do
+                                               if not iface:is_bridgeport() then
+                                                       nempty = false
+                                %>
+                                       <img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
+                               <% end end %>
+                               <% if nempty then %><em><%:(no interfaces attached)%></em><% end %>
+                               </span>
+                       <% end end %>
+                       <% if zempty then %><em><%:(no interfaces attached)%></em><% end %>
                </label>
        </li>
-       <% end %>
+       <% end end %>
 
+       <% if self.widget ~= "checkbox" and not self.nocreate then %>
        <li style="padding:0.5em">
-               <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not value, "checked", "checked")%> /> &nbsp;
+               <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not selected, "checked", "checked")%> /> &nbsp;
                <div style="background-color:<%=fwm.zone.get_color()%>; padding:0.5em; display:inline">
-                       <label<%=attr("for", cbid .. "_new")%>><em><%:a_s_ipt_zone_unspec_create unspecified -or- create:%>&nbsp;</em></label>
-                       <input style="width:6em" type="text"<%=attr("name", cbid .. ".newzone")%> />
+                       <label<%=attr("for", cbid .. "_new")%>><em><%:unspecified -or- create:%>&nbsp;</em></label>
+                       <input style="width:6em" type="text"<%=attr("name", cbid .. ".newzone") .. ifattr(not selected, "value", luci.http.formvalue(cbid .. ".newzone") or self.default)%> onfocus="document.getElementById('<%=cbid%>_new').checked=true" />
                </div>
        </li>
+       <% end %>
 </ul>
 
 <%+cbi/valuefooter%>