libs/web: treat .rmempty like .optional for live field validation

diff --git a/libs/web/luasrc/view/cbi/dynlist.htm b/libs/web/luasrc/view/cbi/dynlist.htm
index 387299dec11b9969012586f70b27dc0f72217912..5f57941b800072c57bf4ac52ccdfa68c0f18b1a4 100644 (file)
--- a/libs/web/luasrc/view/cbi/dynlist.htm
+++ b/libs/web/luasrc/view/cbi/dynlist.htm
@@ -39,7 +39,7 @@ cbi_dynlist_init('<%=cbid%>');
                <%- end -%>', '<%: -- custom -- %>');
        <% end -%>
        <% for i=1, #vals + 1 do -%>
-       cbi_validate_field('<%=cbid%>.<%=i%>', <%=tostring(self.optional == true or i > #vals)%>, '<%=self.datatype%>');
+       cbi_validate_field('<%=cbid%>.<%=i%>', <%=tostring((self.optional or self.rmempty) == true or i > #vals)%>, '<%=self.datatype%>');
        <%- end %>
 <% end -%>
 </script>

diff --git a/libs/web/luasrc/view/cbi/value.htm b/libs/web/luasrc/view/cbi/value.htm
index 84daafd46501a32a09c8001ce0c3e7ef3a810d11..d94863e9002e490b5a7c5cb83a5906a98200ebcb 100644 (file)
--- a/libs/web/luasrc/view/cbi/value.htm
+++ b/libs/web/luasrc/view/cbi/value.htm
@@ -40,7 +40,7 @@ $Id$
                <%- end -%>');
                <%- end %>
                <% if self.datatype then -%>
-               cbi_validate_field('<%=cbid%>', <%=tostring(self.optional == true)%>, '<%=self.datatype%>');
+               cbi_validate_field('<%=cbid%>', <%=tostring((self.optional or self.rmempty) == true)%>, '<%=self.datatype%>');
                <%- end %>
        </script>
        <% end -%>