Changeset 2507

Timestamp:

01/27/10 16:56:14 (7 weeks ago)

Author:

JensDiemer

Message:

django updates: After model validation lands, we can't easy use ModelForm?

Files:

• branches/0.9/pylucid_project/pylucid_plugins/auth/forms.py (modified) (9 diffs)

branches/0.9/pylucid_project/pylucid_plugins/auth/forms.py

@@ -5 +5 @@
 from django.contrib import auth
 from django.contrib.auth.models import User
+from django.utils.translation import ugettext as _
 
 from pylucid_project.utils import crypt
@@ -36 +37 @@
     )
     sha_b = forms.CharField(
-        min_length=crypt.HASH_LEN/2, max_length=crypt.HASH_LEN/2
+        min_length=crypt.HASH_LEN / 2, max_length=crypt.HASH_LEN / 2
     )
 
@@ -53 +54 @@
 
         # Fill with null, to match the full SHA1 hexdigest length.
-        fill_len = crypt.HASH_LEN - (crypt.HASH_LEN/2)
+        fill_len = crypt.HASH_LEN - (crypt.HASH_LEN / 2)
         temp_value = ("0" * fill_len) + sha_value
 
@@ -69 +70 @@
     # Should normaly never be send back!
     raw_password = forms.CharField(
-        help_text="(required)", required=False, widget = forms.PasswordInput()
+        help_text="(required)", required=False, widget=forms.PasswordInput()
     )
 
@@ -75 +76 @@
         label="SHA1 for django",
         help_text="(automatic generated with JavaScript.)",
-        widget = forms.TextInput(attrs={"readonly":"readonly", "size":"40"}),
+        widget=forms.TextInput(attrs={"readonly":"readonly", "size":"40"}),
         min_length=crypt.HASH_LEN, max_length=crypt.HASH_LEN
     )
@@ -81 +82 @@
         label="SHA1 for PyLucid",
         help_text="(automatic generated with JavaScript.)",
-        widget = forms.TextInput(attrs={"readonly":"readonly", "size":"40"}),
+        widget=forms.TextInput(attrs={"readonly":"readonly", "size":"40"}),
         min_length=crypt.HASH_LEN, max_length=crypt.HASH_LEN
     )
@@ -98 +99 @@
 # FORMS
 
-class BaseModelForm(forms.ModelForm):
-    """
-    A model form witch don't validate unique fields.
-
-    This ModelForm is only for generating the forms and not for create/update
-    any database data. So a field unique Test would like generate Errors like:
-        User with this Username already exists.
-
-    see also:
-    http://www.jensdiemer.de/_command/118/blog/detail/30/ (de)
-    http://www.python-forum.de/topic-16000.html (de)
-    """
-    def validate_unique(self):
-        pass
-
-
-class UsernameForm(BaseModelForm):
+#class BaseModelForm(forms.ModelForm):
+#    """
+#    A model form witch don't validate unique fields.
+#
+#    This ModelForm is only for generating the forms and not for create/update
+#    any database data. So a field unique Test would like generate Errors like:
+#        User with this Username already exists.
+#
+#    see also:
+#    http://www.jensdiemer.de/_command/118/blog/detail/30/ (de)
+#    http://www.python-forum.de/topic-16000.html (de)
+#    """
+#    def __init__(self, *args, **kwargs):
+#        """ Change field meta in a DRY way """
+#        super(BaseModelForm, self).__init__(*args, **kwargs)
+#
+#        self.model.full_validate = self._skip
+#
+#    def _skip(self, *args, **kwargs):
+#        pass
+#
+#    def validate_unique(self):
+#        pass
+
+class UsernameForm(forms.Form):
     """
     form for input the username, used in auth.login()
-    """   
+    
+    FIXME: This is not DRY.
+    """
+    username = forms.CharField(max_length=_('30'), label=_('Username'),
+        help_text=_('Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores).')
+    )
+
     def is_valid(self):
         """ do a secont validation: try to get the user from database and
-        check if he is active """        
+        check if he is active """
         is_valid = super(UsernameForm, self).is_valid()
         if not is_valid:
             return False
-        
+
         username = self.cleaned_data["username"]
         try:
-            self.user = User.objects.get(username = username)
+            self.user = User.objects.get(username=username)
         except User.DoesNotExist, e:
             self._errors["username"] = ("User doesn't exist!",)
             return False
+
+        return True
+
+#    class Meta:
+#        model = User
+#        fields = ("username",)
+
+
+class PasswordForm(forms.Form):
+    """
+    form for input the username, used in auth._sha_login()
     
-        return True
-        
-    class Meta:
-        model = User
-        fields=("username",)
-
-
-class PasswordForm(BaseModelForm):
-    """
-    form for input the username, used in auth._sha_login()
-    """
-    def __init__(self, *args, **kwargs):
-        """ Change field meta in a DRY way """
-        super(PasswordForm, self).__init__(*args, **kwargs)
-
-        self.fields['password'].widget = forms.PasswordInput()
-        self.fields['password'].help_text = ""
+    FIXME: This is not DRY.
+    """
+    password = forms.CharField(max_length=_('128'), label=_('Password'), widget=forms.PasswordInput()
+    )
+
+#    def __init__(self, *args, **kwargs):
+#        """ Change field meta in a DRY way """
+#        super(PasswordForm, self).__init__(*args, **kwargs)
+#
+#        self.fields['password'].widget = forms.PasswordInput()
+#        self.fields['password'].help_text = ""
 
     def is_valid(self, username):
@@ -154 +174 @@
         if not is_valid:
             return False
-        
+
         password = self.cleaned_data["password"]
         self.user = auth.authenticate(username=username, password=password)
@@ -160 +180 @@
             self._errors["password"] = ("Wrong password!",)
             return False
-        
+
         return True
 
-    class Meta:
-        model = User
-        fields=("password",)
-
-
-class ResetForm(BaseModelForm):
+#    class Meta:
+#        model = User
+#        fields = ("password",)
+
+
+class ResetForm(forms.Form):
     """
     from for input username and email, used in auth.pass_reset()
     """
-    def __init__(self, *args, **kwargs):
-        super(ResetForm, self).__init__(*args, **kwargs)
-        # User.email is normaly a not required field, here it's required!
-        self.fields['email'].required = True
-        
-    class Meta:
-        model = User
-        fields=("username","email")
+    username = forms.CharField(max_length=_('30'), label=_('Username'),
+        help_text=_('Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores).')
+    )
+    email = forms.EmailField(max_length=_('75'), label=_('E-mail address'))
+
+#    def __init__(self, *args, **kwargs):
+#        super(ResetForm, self).__init__(*args, **kwargs)
+#        # User.email is normaly a not required field, here it's required!
+#        self.fields['email'].required = True
+
+#    class Meta:
+#        model = User
+#        fields = ("username", "email")