From 4c199b0ab21d1998a96ee497f6b79cfee445b2af Mon Sep 17 00:00:00 2001
From: Rebeccah <rhunter@redhat.com>
Date: Wed, 23 Oct 2019 17:15:40 -0400
Subject: [PATCH] moved filterint out policy instance values in the api browser
 input box into the instanceGroupDetail class where I overrode the
 update_raw_data function to parse out the unneeded data. Additionally added
 the fix for checking the value in the serializer.

---
 awx/api/generics.py       | 8 +-------
 awx/api/serializers.py    | 2 +-
 awx/api/views/__init__.py | 7 +++++++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/awx/api/generics.py b/awx/api/generics.py
index 4f595cb384..8b8fb55894 100644
--- a/awx/api/generics.py
+++ b/awx/api/generics.py
@@ -46,7 +46,7 @@ from awx.main.utils import (
     decrypt_field
 )
 from awx.main.utils.db import get_all_field_names
-from awx.api.serializers import ResourceAccessListElementSerializer, CopySerializer, UserSerializer, InstanceGroupSerializer
+from awx.api.serializers import ResourceAccessListElementSerializer, CopySerializer, UserSerializer
 from awx.api.versioning import URLPathVersioning
 from awx.api.metadata import SublistAttachDetatchMetadata, Metadata
 
@@ -317,12 +317,6 @@ class GenericAPIView(generics.GenericAPIView, APIView):
             for name, field in list(serializer.fields.items()):
                 if getattr(field, 'read_only', None):
                     del serializer.fields[name]
-                # Additionally, remove the following fields if an instance group is containerized.
-                if name == 'is_containerized' and type(serializer) == InstanceGroupSerializer:
-                    if serializer.instance is not None and serializer.instance.is_containerized:
-                        del serializer.fields['policy_instance_percentage']
-                        del serializer.fields['policy_instance_minimum']
-                        del serializer.fields['policy_instance_list']
             serializer._data = self.update_raw_data(serializer.data)
         return serializer
 
diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 816a7bf4e0..00a90b2653 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -4801,7 +4801,7 @@ class InstanceGroupSerializer(BaseSerializer):
                 raise serializers.ValidationError(_('Isolated instances may not be added or removed from instances groups via the API.'))
             if self.instance and self.instance.controller_id is not None:
                 raise serializers.ValidationError(_('Isolated instance group membership may not be managed via the API.'))
-        if self.instance.is_containerized:
+        if value and self.instance.is_containerized:
             raise serializers.ValidationError(_('Containerized instances may not be managed via the API'))
         return value
 
diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py
index 23e66810fe..dd31948acf 100644
--- a/awx/api/views/__init__.py
+++ b/awx/api/views/__init__.py
@@ -383,6 +383,13 @@ class InstanceGroupDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAP
     serializer_class = serializers.InstanceGroupSerializer
     permission_classes = (InstanceGroupTowerPermission,)
 
+    def update_raw_data(self, data):
+        if self.get_object().is_containerized:
+            data.pop('policy_instance_percentage', None)
+            data.pop('policy_instance_minimum', None)
+            data.pop('policy_instance_list', None)
+        return super(InstanceGroupDetail, self).update_raw_data(data)
+
     def destroy(self, request, *args, **kwargs):
         instance = self.get_object()
         if instance.controller is not None: