merged master into stable after new deployment

1 files changed, 12 insertions, 6 deletions

diff --git a/program/forms.py b/program/forms.py
index 0ecd371..9bfb7ad 100644
--- a/program/forms.py
+++ b/program/forms.py
@@ -1,15 +1,16 @@
-from django import forms
+from django.forms import ModelForm, ValidationError
 from django.core.files.images import get_image_dimensions
 
 from program.models import MusicFocus, ShowInformation, ShowTopic
 
-class FormWithButton(forms.ModelForm):
+
+class FormWithButton(ModelForm):
     def clean_button(self):
         button = self.cleaned_data.get('button')
         if button:
             width, height = get_image_dimensions(button)
             if width != 11 or height != 11:
-                raise forms.ValidationError("width or height is not 11, (11x11)")
+                raise ValidationError("width or height is not 11, (11x11)")
         return button
 
     def clean_button_hover(self):
@@ -17,7 +18,7 @@ class FormWithButton(forms.ModelForm):
         if button_hover:
             width, height = get_image_dimensions(button_hover)
             if width != 11 or height != 11:
-                raise forms.ValidationError("width or height is not 11, (11x11)")
+                raise ValidationError("width or height is not 11, (11x11)")
         return button_hover
 
     def clean_big_button(self):
@@ -25,18 +26,23 @@ class FormWithButton(forms.ModelForm):
         if big_button:
             width, height = get_image_dimensions(big_button)
             if width != 17 or height != 17:
-                raise forms.ValidationError("width or height is not 17, (17x17)")
+                raise ValidationError("width or height is not 17, (17x17)")
         return big_button
 
+
 class MusicFocusForm(FormWithButton):
     class Meta:
         model = MusicFocus
+        fields = '__all__'
+
 
 class ShowInformationForm(FormWithButton):
     class Meta:
         model = ShowInformation
+        fields = '__all__'
+
 
 class ShowTopicForm(FormWithButton):
     class Meta:
         model = ShowTopic
-
+        fields = '__all__'