Reduce branching

eldarion · Jun 11, 2017 · 8ad1b3d · 8ad1b3d
1 parent 9a82d4b
commit 8ad1b3d
Showing 1 changed file with 61 additions and 24 deletions.
diff --git a/formly/models.py b/formly/models.py
@@ -356,38 +356,75 @@ def _get_field_class(self, choices):
             help_text=self.help_text,
             required=self.required
         )
-        if self.field_type == Field.TEXT_AREA:
-            field_class = forms.CharField
-            kwargs.update({"widget": forms.Textarea()})
-        elif self.field_type in [Field.RADIO_CHOICES, Field.LIKERT_FIELD, Field.RATING_FIELD]:
-            field_class = forms.ChoiceField
-            if self.field_type == Field.LIKERT_FIELD:
-                kwargs.update({"widget": LikertSelect(), "choices": choices})
-            elif self.field_type == Field.RATING_FIELD:
-                kwargs.update({"widget": RatingSelect(), "choices": choices})
-            else:
-                kwargs.update({"widget": forms.RadioSelect(), "choices": choices})
-        elif self.field_type == Field.DATE_FIELD:
-            field_class = forms.DateField
-        elif self.field_type == Field.SELECT_FIELD:
-            field_class = forms.ChoiceField
-            kwargs.update({"widget": forms.Select(), "choices": choices})
-        elif self.field_type == Field.CHECKBOX_FIELD:
-            field_class = forms.MultipleChoiceField
-            kwargs.update({"widget": forms.CheckboxSelectMultiple(), "choices": choices})
-        elif self.field_type == Field.BOOLEAN_FIELD:
-            field_class = forms.BooleanField
-        elif self.field_type == Field.MEDIA_FIELD:
-            field_class = forms.FileField
+        field_class = FIELD_TYPES[self.field_type]["field_class"]
+        kwargs.update(**FIELD_TYPES[self.field_type]["kwargs"])
+
+        if self.field_type in [Field.CHECKBOX_FIELD, Field.SELECT_FIELD, Field.RADIO_CHOICES, Field.LIKERT_FIELD, Field.RATING_FIELD]:
+            kwargs.update({"choices": choices})
         elif self.field_type == Field.MULTIPLE_TEXT:
-            field_class = MultipleTextField
             kwargs.update({
                 "fields_length": self.expected_answers,
                 "widget": MultiTextWidget(widgets_length=self.expected_answers),
             })
         return field_class, kwargs
 
 
+FIELD_TYPES = {
+    Field.TEXT_AREA: dict(
+        field_class=forms.CharField,
+        kwargs=dict(
+            widget=forms.Textarea()
+        )
+    ),
+    Field.RADIO_CHOICES: dict(
+        field_class=forms.ChoiceField,
+        kwargs=dict(
+            widget=forms.RadioSelect()
+        )
+    ),
+    Field.LIKERT_FIELD: dict(
+        field_class=forms.ChoiceField,
+        kwargs=dict(
+            widget=LikertSelect()
+        )
+    ),
+    Field.RATING_FIELD: dict(
+        field_class=forms.ChoiceField,
+        kwargs=dict(
+            widget=RatingSelect()
+        )
+    ),
+    Field.DATE_FIELD: dict(
+        field_class=forms.DateField,
+        kwargs=dict()
+    ),
+    Field.SELECT_FIELD: dict(
+        field_class=forms.ChoiceField,
+        kwargs=dict(
+            widget=forms.Select()
+        )
+    ),
+    Field.CHECKBOX_FIELD: dict(
+        field_class=forms.MultipleChoiceField,
+        kwargs=dict(
+            widget=forms.CheckboxSelectMultiple()
+        )
+    ),
+    Field.BOOLEAN_FIELD: dict(
+        field_class=forms.BooleanField,
+        kwargs=dict()
+    ),
+    Field.MEDIA_FIELD: dict(
+        field_class=forms.FileField,
+        kwargs=dict()
+    ),
+    Field.MULTIPLE_TEXT: dict(
+        field_class=MultipleTextField,
+        kwargs=dict()
+    )
+}
+
+
 @python_2_unicode_compatible
 class FieldChoice(models.Model):
     field = models.ForeignKey(Field, related_name="choices")