Merge branch 'master' of heroku.com:djangosnippets

django · Jul 31, 2012 · 8e44991 · 8e44991
2 parents 514d531 + 4cc0bfe
commit 8e44991
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/cab/comments/forms.py b/cab/comments/forms.py
@@ -3,10 +3,12 @@
 
 
 class CapCommentForm(CommentForm):
-    name = forms.CharField(label='Your Name', required=False,
+    pass
+
+    your_name = forms.CharField(label='Your Name', required=False,
         widget=forms.TextInput(attrs={'autocomplete': 'off'}))
 
     def clean(self):
-        if self.cleaned_data.get('name'):
+        if self.cleaned_data.get('your_name'):
             raise forms.ValidationError('Please keep the Name field blank')
-        return self.cleaned_data
+        return self.cleaned_data
diff --git a/cab/forms.py b/cab/forms.py
@@ -54,10 +54,10 @@ def search(self):
 
 
 class RegisterForm(RegistrationFormUniqueEmail):
-    name = forms.CharField(label='Your Name', required=False,
+    your_name = forms.CharField(label='Your Name', required=False,
         widget=forms.TextInput(attrs={'autocomplete': 'off'}))
 
     def clean(self):
-        if self.cleaned_data.get('name'):
+        if self.cleaned_data.get('your_name'):
             raise forms.ValidationError('Please keep the Name field blank')
         return self.cleaned_data
diff --git a/djangosnippets/templates/registration/registration_form.html b/djangosnippets/templates/registration/registration_form.html
@@ -15,7 +15,7 @@
           {{ field }}
         {% else %}
           {% if field.errors %}{{ field.errors }}{% endif %}
-        <tr {% ifequal field.name "name" %} class="bee-like-this"{% endifequal %}>
+        <tr {% ifequal field.name "your_name" %} class="bee-like-this"{% endifequal %}>
           <td{% if field.errors %} class="error"{% endif %}>
             {{ field.label_tag }}
           </td>