SVN: r22724 - trunk/quixote/form2

Author: nascheme
Date: 2003-10-09 15:19:47 -0400 (Thu, 09 Oct 2003)
New Revision: 22724

Modified:
   trunk/quixote/form2/form.py
Log:
Fix 'required' check in WidgetRow.


Modified: trunk/quixote/form2/form.py
===================================================================
--- trunk/quixote/form2/form.py	2003-10-09 17:25:50 UTC (rev 22723)
+++ trunk/quixote/form2/form.py	2003-10-09 19:19:47 UTC (rev 22724)
@@ -77,7 +77,7 @@
         self.hint = hint
         self.required = required
         if required and get_request().form:
-            if self.get_value() is None and not self.get_error():
+            if self.get_value() is None and not self.has_errors():
                 self.set_error('value is required')
 
     def get_value(self):
@@ -86,17 +86,11 @@
     def set_error(self, error):
         self.widget.set_error(error)
 
-    def _get_error(self):
-        error = self.widget.get_error()
-        if not error and self.required and self.get_value() is None:
-            error = 'value is required'
-        return error
-
     def has_errors(self):
-        return self._get_error()
+        return self.widget.get_error()
 
     def _render_error(self):
-        return render_error(self._get_error())
+        return render_error(self.widget.get_error())
 
     def _render_hint(self):
         return render_hint(self.hint)