Changeset 1758

Timestamp:

09/11/08 08:24:10 (2 months ago)

Author:

JensDiemer

Message:

remove the work-a-round: ticket:227

Location:

trunk/pylucid_project

Files:

• PyLucid/plugins_internal/auth/auth.py (modified) (2 diffs)
• tests/sha1_js_login.py (modified) (1 diff)

trunk/pylucid_project/PyLucid/plugins_internal/auth/auth.py

@@ -161 +161 @@
 # FORMS
 
-#class UsernameForm(forms.ModelForm):
-#    """
-#    form for input the username, used in auth.login()
-#    """
-#    class Meta:
-#        model = User
-#        fields=("username",)
-
-class UsernameForm(forms.Form):
-    """
-    FIXME: If we use ModelForm from above, we always get the form error:
-        User with this Username already exists.
-    Why?
-    """
-    username = forms.CharField(max_length=30, help_text=_(
-            "Required. 30 characters or fewer. Alphanumeric characters only"
-            " (letters, digits and underscores)."
-        )
-    )
-
-#class PasswordForm(forms.ModelForm):
-#    """
-#    form for input the username, used in auth._sha_login()
-#    """
-#    class Meta:
-#        model = User
-#        fields=("password",)
-class PasswordForm(forms.Form):
-    """
-    Same 'User with this Username already exists.' problem from above.
-    """
-    password = forms.CharField(max_length=128)
-
-
-class ResetForm(forms.Form):
-    """
-    We should not use a ModelForm from the User model, because, the email
-    is required here or we must patch a ModelForm.
-    """
-    username = forms.CharField(max_length=30, help_text=_(
-            "Required. 30 characters or fewer. Alphanumeric characters only"
-            " (letters, digits and underscores)."
-        )
-    )
-    email = forms.EmailField()
+class ModelForm2(forms.ModelForm):
+    def validate_unique(self):
+        """
+        Don't validate unique fields.
+        We used a ModelForm 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.
+        """
+        pass
+
+
+class UsernameForm(ModelForm2):
+    """
+    form for input the username, used in auth.login()
+    """    
+    class Meta:
+        model = User
+        fields=("username",)
+
+
+class PasswordForm(ModelForm2):
+    """
+    form for input the username, used in auth._sha_login()
+    """
+    class Meta:
+        model = User
+        fields=("password",)
+
+
+class ResetForm(ModelForm2):
+    """
+    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")
 
 
@@ -253 +250 @@
             username_form = UsernameForm()
         else:
-#            self.page_msg(self.request.POST)
-            username_form = UsernameForm(self.request.POST)
+            #self.page_msg(self.request.POST)
+            username_form = UsernameForm(self.request.POST)          
             user = get_data(username_form)
             if user != None: # A valid form with a existing user was send.

trunk/pylucid_project/tests/sha1_js_login.py

@@ -595 +595 @@
     def test_pass_reset_form_errors4(self):
         """
-        form validating test: Check with not existing user.
+        form validating test: Check without sending a email Adress.
         """
         response = self.client.post(self.pass_reset_url,