Adding choices to serialzier for ChoiceFields

john-westcott-iv · Jan 25, 2024 · ac5c207 · ac5c207
1 parent 72877cf
commit ac5c207
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/ansible_base/authentication/authenticator_plugins/base.py b/ansible_base/authentication/authenticator_plugins/base.py
@@ -32,16 +32,18 @@ def get_configuration_schema(self):
             if field.default is not empty:
                 default = field.default
 
-            schema.append(
-                {
-                    "name": f,
-                    "help_text": field.help_text,
-                    "required": not field.allow_null,
-                    "default": default,
-                    "type": field.__class__.__name__,
-                    "ui_field_label": getattr(field, 'ui_field_label', _('Undefined')),
-                }
-            )
+            schema_data = {
+                "name": f,
+                "help_text": field.help_text,
+                "required": not field.allow_null,
+                "default": default,
+                "type": field.__class__.__name__,
+                "ui_field_label": getattr(field, 'ui_field_label', _('Undefined')),
+            }
+            if getattr(field, 'choices', None):
+                schema_data["choices"] = getattr(field, 'choices')
+
+            schema.append(schema_data)
         return schema
 
 

diff --git a/ansible_base/lib/serializers/fields.py b/ansible_base/lib/serializers/fields.py
@@ -25,8 +25,6 @@ def __init__(self, **kwargs):
 
 class ChoiceField(UILabelMixIn, serializers.ChoiceField):
     def __init__(self, **kwargs):
-        # TODO: SEE IF THIS WORKS FOR KEITH on the authenticator_plugin page see if its now shows options for the choice fields.
-        self.ui_field_label = kwargs.pop('ui_field_label', 'Undefined')
         super().__init__(**kwargs)