changeset 92:c5d76a735410

Fixed a validation bug w/ colors
author Atul Varma <varmaa@toolness.com>
date Thu, 27 Mar 2008 18:21:22 -0700
parents cad201e72d73
children 6acab0e0bca5 e1bfeffce0f0
files PersonasBackend/personas/forms.py
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/PersonasBackend/personas/forms.py	Thu Mar 27 17:52:19 2008 -0700
+++ b/PersonasBackend/personas/forms.py	Thu Mar 27 18:21:22 2008 -0700
@@ -12,7 +12,7 @@
 
     def wrapper( *args, **kwargs ):
         try:
-            func( *args, **kwargs )
+            return func( *args, **kwargs )
         except ValueError, e:
             raise ValidationError( e.message )
 
@@ -29,15 +29,15 @@
         exclude = ["owner", "date_published", "popularity", "status"]
 
     @newforms_validator
-    def _color_cleaner( self, value ):
-        models.ensure_color_is_valid( value )
-        return value
+    def _color_cleaner( self, field ):
+        models.ensure_color_is_valid( self.cleaned_data[field] )
+        return self.cleaned_data[field]
 
     def clean_text_color( self ):
-        return self._color_cleaner( self.data["text_color"] )
+        return self._color_cleaner( "text_color" )
 
     def clean_accent_color( self ):
-        return self._color_cleaner( self.data["accent_color"] )
+        return self._color_cleaner( "accent_color" )
 
     def clean( self ):
         form_data = dict( self.cleaned_data )