From 0d4ec2bbba8479154e63824e5315a0e0e01087a2 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 9 Oct 2011 18:43:11 +0000
Subject: libs/web: add error message printing to nullsection template, fixes
 server side validation in SimpleForm instances

---
 libs/web/luasrc/view/cbi/nullsection.htm | 51 +++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 17 deletions(-)

(limited to 'libs/web/luasrc/view/cbi/nullsection.htm')

diff --git a/libs/web/luasrc/view/cbi/nullsection.htm b/libs/web/luasrc/view/cbi/nullsection.htm
index 063e7e6e61..9a91432ad8 100644
--- a/libs/web/luasrc/view/cbi/nullsection.htm
+++ b/libs/web/luasrc/view/cbi/nullsection.htm
@@ -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
+%>
-- 
cgit v1.2.3