(#15, #23) Adding email field when registering

main/forms.py

@@ -1,8 +1,25 @@
 from django.db import models
 from django.contrib.auth.models import User
-from django.forms import ModelForm, ModelChoiceField, HiddenInput, IntegerField
+from django.contrib.auth.forms import UserCreationForm
+from django.forms import ModelForm, ModelChoiceField, HiddenInput, IntegerField, EmailField
 from .models import Donation, Vote, Purchase, Brewery, Keg, PaymentOption, Suggestion
 
+
+class UserCreationWithEmailForm(UserCreationForm):
+    email = EmailField(required=True)
+
+    class Meta:
+        model = User
+        fields = ("username", "email", "password1", "password2")
+
+    def save(self, commit=True):
+        user = super(UserCreationWithEmailForm, self).save(commit=False)
+        user.email = self.cleaned_data["email"]
+        if commit:
+            user.save()
+        return user
+
+
 class DonationForm(ModelForm):
     user = ModelChoiceField(queryset=User.objects.order_by('username'))
 

main/views.py

@@ -1,5 +1,4 @@
 from django.contrib import messages
-from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.models import User
 from django.db.models import Sum, Max, Q
@@ -13,7 +12,8 @@
 from re import match
 
 from .forms import DonationForm, VoteForm, PurchaseForm, KegForm, \
-    PurchasePriceForm, AddPaymentOptionForm, PurchaseChangeForm
+    PurchasePriceForm, AddPaymentOptionForm, PurchaseChangeForm, \
+    UserCreationWithEmailForm
 from .models import Brewery, Donation, Purchase, KegMaster, PaymentOption, Suggestion, Vote
 from .shared import sum_queryset_field, get_user_balance
 
@@ -332,12 +332,12 @@ def purchase_change(request):
 
 def register(request):
     if request.method == 'POST':
-        form = UserCreationForm(request.POST)
+        form = UserCreationWithEmailForm(request.POST)
         if form.is_valid():
             new_user = form.save()
             return HttpResponseRedirect("/")
     else:
-        form = UserCreationForm()
+        form = UserCreationWithEmailForm()
     context = { 'form': form }
     return render(request, "registration/register.html", context)