Conflicts solved

[SVBaL.git] / python / eh_util / eh_app / forms.py

diff --git a/python/eh_util/eh_app/forms.py b/python/eh_util/eh_app/forms.py
index b257b848307ab7609a746870d08f6f2189f47674..b7625af8884efa10b07d42acad0f3d692068c7f1 100644 (file)
--- a/python/eh_util/eh_app/forms.py
+++ b/python/eh_util/eh_app/forms.py
@@ -23,12 +23,13 @@ https://docs.djangoproject.com/en/2.2/topics/forms/
 - Doku zu Fields:
 https://docs.djangoproject.com/en/2.2/ref/forms/fields/
 '''
+
 class VorlagenForm(forms.Form):
-    template      = forms.ChoiceField(choices=())
-    def __init__(self, *args, templates=[('AB', 'ab'),('BC','bc')], **kwargs):
+    vorlage      = forms.ChoiceField(choices=())
+    def __init__(self, *args, vorlagen=[('AB', 'ab'),('BC','bc')], **kwargs):
         #self.templates = templates
         super().__init__(*args, **kwargs)
-        self.fields['template'].choices = templates
+        self.fields['vorlage'].choices = vorlagen
 
 class VorlagenVerwaltungForm(forms.Form):
     vorlagen_zu_loschen = forms.MultipleChoiceField(