'None' is not considered as 'a Room' when calculating student occupancy caps

roomlist/accounts/forms.py

@@ -78,11 +78,12 @@ class StudentUpdateForm(forms.Form):
     def clean(self):
         cleaned_data = super(StudentUpdateForm, self).clean()
         form_room = cleaned_data.get('room')
-        students_in_room = Student.objects.filter(room=form_room).count()
-        #print(students_in_room)
-        # like in bookshare, I have no idea why the form errors don't display.
-        if students_in_room > 12:
-            raise ValidationError(_('Too many students in room (%d).' % students_in_room), code='invalid')
+        if not(form_room is None):
+            students_in_room = Student.objects.filter(room=form_room).count()
+            #print(students_in_room)
+            # like in bookshare, I have no idea why the form errors don't display.
+            if students_in_room > 12:
+                raise ValidationError(_('Too many students in room (%d).' % students_in_room), code='invalid')
 
     def is_valid(self):
         # errors are not printed in form.as_p?
@@ -117,11 +118,12 @@ class WelcomePrivacyForm(forms.ModelForm):
     def clean(self):
         cleaned_data = super(WelcomePrivacyForm, self).clean()
         form_room = cleaned_data.get('room')
-        students_in_room = Student.objects.filter(room=form_room).count()
-        #print(students_in_room)
-        # like in bookshare, I have no idea why the form errors don't display.
-        if students_in_room > 12:
-            raise ValidationError(_('Too many students in room (%d).' % students_in_room), code='invalid')
+        if not(form_room is None):
+            students_in_room = Student.objects.filter(room=form_room).count()
+            #print(students_in_room)
+            # like in bookshare, I have no idea why the form errors don't display.
+            if students_in_room > 12:
+                raise ValidationError(_('Too many students in room (%d).' % students_in_room), code='invalid')
 
     class Meta:
         model = Student