libs/web: add error message printing to nullsection template, fixes server side valid...
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 9 Oct 2011 18:43:11 +0000 (18:43 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 9 Oct 2011 18:43:11 +0000 (18:43 +0000)
libs/web/luasrc/view/cbi/nullsection.htm

index 063e7e6..9a91432 100644 (file)
@@ -1,18 +1,35 @@
-               <fieldset class="cbi-section">
-                       <% if self.title and #self.title > 0 then -%>
-                               <legend><%=self.title%></legend>
-                       <%- end %>
-                       <div class="cbi-section-node" id="cbi-<%=self.config%>-<%=tostring(self):sub(8)%>">
-                               <% self:render_children(1, scope or {}) %>
+<fieldset class="cbi-section">
+       <% if self.title and #self.title > 0 then -%>
+               <legend><%=self.title%></legend>
+       <%- end %>
+       <div class="cbi-section-node" id="cbi-<%=self.config%>-<%=tostring(self):sub(8)%>">
+               <div>
+                       <% self:render_children(1, scope or {}) %>
+               </div>
+               <% if self.error and self.error[1] then -%>
+                       <div class="cbi-section-error">
+                               <ul><% for _, e in ipairs(self.error[1]) do -%>
+                                       <li>
+                                               <%- if e == "invalid" then -%>
+                                                       <%:One or more fields contain invalid values!%>
+                                               <%- elseif e == "missing" then -%>
+                                                       <%:One or more required fields have no value!%>
+                                               <%- else -%>
+                                                       <%=pcdata(e)%>
+                                               <%- end -%>
+                                       </li>
+                               <%- end %></ul>
                        </div>
-                       <br />
-               </fieldset>
-               <%-
-                       if type(self.hidden) == "table" then
-                               for k, v in pairs(self.hidden) do
-               -%>
-                       <input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
-               <%-
-                               end
-                       end
-               %>
+               <%- end %>
+       </div>
+       <br />
+</fieldset>
+<%-
+       if type(self.hidden) == "table" then
+               for k, v in pairs(self.hidden) do
+-%>
+       <input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
+<%-
+               end
+       end
+%>