Some more redirects. Editing user settings does not work. Overhauled adding a new...

[~kgodey/maayanwich.git] / forms.py

diff --git a/forms.py b/forms.py
index a2c5fc8..e79669c 100644 (file)
--- a/forms.py
+++ b/forms.py
@@ -8,7 +8,8 @@ class SandwichForm(ModelForm):
        
        class Meta:
                model = Sandwich
-               exclude = ('slug', 'user')
+               exclude = ('slug', 'user', 'ingredients')
+               fields = ('adjective', 'date_made', 'notes', 'picture')
 
 
 class IngredientForm(ModelForm):
@@ -24,4 +25,11 @@ class NewUserForm(forms.Form):
        email = forms.EmailField()
        username = forms.CharField()
        password = forms.CharField(widget=forms.PasswordInput)
-       confirm_password = forms.CharField(widget=forms.PasswordInput)
+       confirmpassword = forms.CharField(widget=forms.PasswordInput)
+
+       def clean_mpassword(self):
+               password = self.cleaned_data.get("password", "")
+               cpassword = self.cleaned_data["confirmpassword"]
+               if password != cpassword:
+                       raise forms.ValidationError(_("The two password fields didn't match."))
+                       return cpassword