Merge pull request #117 from jdcaballero/master

Email field in signup form

wiki/forms.py

@@ -18,6 +18,7 @@ from wiki.core.diff import simple_merge
 from django.forms.widgets import HiddenInput
 from wiki.core.plugins.base import PluginSettingsFormMixin
 from django.contrib.auth.models import User
+from django.contrib.auth.forms import UserCreationForm
 from wiki.core import permissions
 
 class SpamProtectionMixin():
@@ -400,3 +401,9 @@ class SearchForm(forms.Form):
     
     query = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'Search...'),
                                                           'class': 'search-query'}), required=False)
+class UserCreationForm(UserCreationForm):
+    email = forms.EmailField(required=True)
+
+    class Meta:
+        model = User
+        fields = ( "username", "email" )

wiki/views/accounts.py

@@ -5,7 +5,7 @@ go ahead and replace it or disable it!"""
 from django.conf import settings as django_settings
 from django.contrib import messages
 from django.contrib.auth import logout as auth_logout, login as auth_login
-from django.contrib.auth.forms import AuthenticationForm, UserCreationForm
+from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
@@ -13,12 +13,13 @@ from django.utils.translation import ugettext as _
 from django.views.generic.base import View
 from django.views.generic.edit import CreateView, FormView
 
+from wiki import forms
 from wiki.models import URLPath
 from wiki.conf import settings
 
 class Signup(CreateView):
     model = User
-    form_class = UserCreationForm
+    form_class = forms.UserCreationForm
     template_name = "wiki/accounts/signup.html"
     
     def dispatch(self, request, *args, **kwargs):
@@ -78,4 +79,4 @@ class Login(FormView):
             if not self.referer:
                 return redirect('wiki:get', path='')
             return redirect(self.referer)
-    
+    
\ No newline at end of file