AC-1040 Exposed list of choices for type field.

awx/api/filters.py

@@ -17,7 +17,7 @@ from rest_framework.exceptions import ParseError
 from rest_framework.filters import BaseFilterBackend
 
 # Ansible Tower
-from awx.main.utils import camelcase_to_underscore
+from awx.main.utils import get_type_for_model
 
 class ActiveOnlyBackend(BaseFilterBackend):
     '''
@@ -52,10 +52,10 @@ class TypeFilterBackend(BaseFilterBackend):
                     ct_model = ct.model_class()
                     if not ct_model:
                         continue
-                    ct_type = camelcase_to_underscore(ct_model._meta.object_name)
+                    ct_type = get_type_for_model(ct_model)
                     types_map[ct_type] = ct.pk
                 model = queryset.model
-                model_type = camelcase_to_underscore(model._meta.object_name)
+                model_type = get_type_for_model(model)
                 if 'polymorphic_ctype' in model._meta.get_all_field_names():
                     types_pks = set([v for k,v in types_map.items() if k in types])
                     queryset = queryset.filter(polymorphic_ctype_id__in=types_pks)

awx/api/generics.py

@@ -197,6 +197,14 @@ class GenericAPIView(generics.GenericAPIView, APIView):
                 # appropriate metadata about the fields that should be supplied.
                 serializer = self.get_serializer()
                 actions['GET'] = serializer.metadata()
+                # Inject the type field choices into GET options as well as on
+                # the metadata itself.
+                if 'type' in actions['GET']:
+                    actions['GET']['type']['type'] = 'multiple choice'
+                    actions['GET']['type']['choices'] = [
+                        (x, unicode(get_model_for_type(x)._meta.verbose_name))
+                        for x in serializer.get_types()
+                    ]
                 ret['types'] = serializer.get_types()
         if actions:
             ret['actions'] = actions

awx/api/serializers.py

@@ -30,7 +30,7 @@ from rest_framework import serializers
 
 # AWX
 from awx.main.models import *
-from awx.main.utils import update_scm_url, camelcase_to_underscore
+from awx.main.utils import update_scm_url, get_type_for_model
 
 logger = logging.getLogger('awx.api.serializers')
 
@@ -214,8 +214,7 @@ class BaseSerializer(serializers.ModelSerializer):
         return ret
 
     def get_type(self, obj):
-        opts = get_concrete_model(self.opts.model)._meta
-        return camelcase_to_underscore(opts.object_name)
+        return get_type_for_model(self.opts.model)
 
     def get_types(self):
         return [self.get_type(None)]