CBI: Fix subdependencies

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

diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
index d05714033c31bb270adaade76ee5c1225aba0e62..9130a99f96f38a7b699a4a267bd2bae3b08c6e4d 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -13,8 +13,8 @@ $Id$
 
 -%>
 
-               <% if #self.description > 0 then -%>
-                       <% if not luci.util.instanceof( self, luci.cbi.Flag ) then -%>
+               <% if self.description and #self.description > 0 then -%>
+                       <% if not luci.util.instanceof( self, luci.cbi.Flag ) or self.orientation == "horizontal" then -%>
                                <br />
                        <%- end %>
                        <div class="cbi-value-description">
@@ -27,8 +27,21 @@ $Id$
        <%- end -%>
 </div>
 
-<% if #self.deps > 0 then -%>
-       <script type="text/javascript">
+
+<% if #self.deps > 0 or #self.subdeps > 0 then -%>
+       <script type="text/javascript" id="cbip-<%=self.config.."-"..section.."-"..self.option%>">
+               <% for j, d in ipairs(self.subdeps) do -%>
+                       cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option..d.add%>", {
+               <%-
+                       for k,v in pairs(d.deps) do
+               -%>
+                       <%-=string.format('"cbid.%s.%s.%s"', self.config, section, k) .. ":" .. string.format("%q", v)-%>
+                       <%-if next(d.deps, k) then-%>,<%-end-%>
+               <%-
+                       end
+               -%>
+                       }, "cbip-<%=self.config.."-"..section.."-"..self.option..d.add%>");
+               <%- end %>
                <% for j, d in ipairs(self.deps) do -%>
                        cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option..d.add%>", {
                <%-
@@ -39,7 +52,7 @@ $Id$
                <%-
                        end
                -%>
-                       });
+                       }, "cbip-<%=self.config.."-"..section.."-"..self.option..d.add%>");
                <%- end %>
        </script>
 <%- end %>