Changeset 2060

Timestamp:

06/23/09 13:00:54 (9 months ago)

Author:

JensDiemer

Message:

• rename ColorField? to ColorValueField?
• simple name.replace(" ", "_") for color names
• create UserProfile? in set_password if not exist

Location:

branches/0.9/pylucid_project/apps/pylucid

Files:

• fields.py (modified) (2 diffs)
• models.py (modified) (6 diffs)

branches/0.9/pylucid_project/apps/pylucid/fields.py

@@ -46 +46 @@
         raise exceptions.ValidationError(_("Error: %r is not a CSS hex color value") % value)
 
-class ColorInputWidget(forms.TextInput):
+
+#-----------------------------------------------------------------------------
+
+
+class ColorValueInputWidget(forms.TextInput):
     """
-    Add background-color into input tag
-    TODO: Change text color, if background is to dark ;)
-    TODO2: Use jQuery to change the <td> background color ;)
+    Add background-ColorValue into input tag
+    TODO: Change text ColorValue, if background is to dark ;)
+    TODO2: Use jQuery to change the <td> background ColorValue ;)
     """
     def render(self, name, value, attrs=None):
         if not attrs:
             attrs = {}
-        attrs["style"] = "background-color:#%s;" % value
-        return super(ColorInputWidget, self).render(name, value, attrs)
+        attrs["style"] = "background-ColorValue:#%s;" % value
+        return super(ColorValueInputWidget, self).render(name, value, attrs)
 
 
-class ColorFormField(forms.CharField):
-    """ form field for a CSS color value """
-    widget = ColorInputWidget
+class ColorValueFormField(forms.CharField):
+    """ form field for a CSS ColorValue value """
+    widget = ColorValueInputWidget
     def clean(self, value):
         """ validate the form data """
-        value = super(ColorFormField, self).clean(value)
-        validate_css_color_value(value)
+        value = super(ColorValueFormField, self).clean(value)
+        validate_css_ColorValue_value(value)
         self.value = value
         return value
 
 
-class ColorField(models.CharField):
-    """ CSS color hex value field. """
+class ColorValueField(models.CharField):
+    """ CSS ColorValue hex value field. """
     #__metaclass__ = models.SubfieldBase
     def __init__(self, *args, **kwargs):
@@ -79 +83 @@
     def get_db_prep_save(self, value):
         "Returns field's value prepared for saving into a database."
-        validate_css_color_value(value)
+        validate_css_ColorValue_value(value)
         return value
 
     def to_python(self, value):
-        validate_css_color_value(value)
+        validate_css_ColorValue_value(value)
         return value
 
     def formfield(self, **kwargs):
         # Always use own form field and widget:
-        kwargs['form_class'] = ColorFormField
-        kwargs['widget'] = ColorInputWidget
-        return super(ColorField, self).formfield(**kwargs)
+        kwargs['form_class'] = ColorValueFormField
+        kwargs['widget'] = ColorValueInputWidget
+        return super(ColorValueField, self).formfield(**kwargs)
 
 

branches/0.9/pylucid_project/apps/pylucid/models.py

@@ -45 +45 @@
 from pylucid.system.auto_model_info import UpdateInfoBaseModel,AutoSiteM2M
 from pylucid.shortcuts import user_message_or_warn
-from pylucid.fields import ColorField
+from pylucid.fields import ColorValueField
 from pylucid.system import headfile
 
@@ -488 +488 @@
         help_text="Name if this color (e.g. main_color, head_background)"
     )
-    value = ColorField(help_text="CSS hex color value.")
+    value = ColorValueField(help_text="CSS hex color value.")
     
     def save(self, *args, **kwargs):
+        self.name = self.name.replace(" ", "_")
         new_name = self.name
         old_name = Color.objects.get(id=self.id).name
@@ -522 +523 @@
     
     def __unicode__(self):
-        sites = [site.name for site in self.site.all()]
-        return u"Color '%s' (%s, on sites: %r)" % (self.name, self.colorscheme, sites)
+        return u"Color '%s' #%s (%s)" % (self.name, self.value, self.colorscheme)
     
     class Meta:
@@ -757 +757 @@
         self.sha_login_salt = salt
         self.sha_login_checksum = sha_checksum
-        user_message_or_warn("SHA Login salt+checksum created for user '%s'." % self.user)
+        user_message_or_warn("SHA Login salt+checksum set for user '%s'." % self.user)
 
     def __unicode__(self):
@@ -793 +793 @@
     """ signal handler: creating user profile, after a new user created. """
     user = kwargs["instance"]
-            
+        
     userprofile, created = UserProfile.objects.get_or_create(user=user)
     if created:
@@ -827 +827 @@
     orig_set_password(user, raw_password)
     
-    user_profile = user.get_profile()
+    userprofile, created = UserProfile.objects.get_or_create(user=user)
+    if created:
+        user_message_or_warn("UserProfile entry for user '%s' created." % user)
 
     # Save the password for the JS-SHA-Login:
-    user_profile.set_sha_login_password(raw_password)
-    user_profile.save()
+    userprofile.set_sha_login_password(raw_password)
+    userprofile.save()