From 22e7083d715de2a4db8fd1f4fb2cf749a4b19f5e Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 19 Nov 2018 15:38:11 -0500
Subject: [PATCH 1/2] fix instance group  lookup

---
 .../instance-groups.partial.html                     | 12 ++++++++----
 .../src/templates/labels/labelsList.block.less       |  5 -----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html
index ac82763c5a..7dc4dc4b45 100644
--- a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html
+++ b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html
@@ -1,14 +1,18 @@
 <div class="input-group Form-mixedInputGroup">
-    <span class="input-group-btn">
-        <button type="button" class="Form-lookupButton btn btn-default" ng-click="openInstanceGroupsModal()"
+    <span class="input-group-btn Form-variableHeightButtonGroup">
+        <button type="button" class="Form-lookupButton Form-lookupButton--variableHeight btn btn-default" ng-click="openInstanceGroupsModal()"
             ng-disabled="fieldIsDisabled">
             <i class="fa fa-search"></i>
         </button>
     </span>
     <span id="InstanceGroups" class="form-control Form-textInput Form-textInput--variableHeight input-medium lookup LabelList-lookupTags"
-        ng-disabled="fieldIsDisabled">
-        <div class="LabelList-tagContainer" ng-repeat="tag in instanceGroupsTags">
+        ng-disabled="fieldIsDisabled"
+        ng-class="{'LabelList-lookupTags--disabled' : fieldIsDisabled}">
+        <div ng-if="!fieldIsDisabled" class="LabelList-tagContainer" ng-repeat="tag in instanceGroupsTags">
             <at-tag tag="tag.name" remove-tag="deleteTag(tag)"></at-tag>
         </div>
+        <div ng-if="fieldIsDisabled" class="LabelList-tag" ng-repeat="tag in instanceGroupsTags">
+            <span class="LabelList-name">{{tag.name}}</span>
+        </div>
     </span>
 </div>
diff --git a/awx/ui/client/src/templates/labels/labelsList.block.less b/awx/ui/client/src/templates/labels/labelsList.block.less
index 39041117a0..9796abc56f 100644
--- a/awx/ui/client/src/templates/labels/labelsList.block.less
+++ b/awx/ui/client/src/templates/labels/labelsList.block.less
@@ -92,11 +92,6 @@
 .LabelList-lookupTags {
     display: flex;
     padding: 0 12px;
-    overflow-y: hidden;
-}
-
-.LabelList-lookupTags[disabled] {
-    pointer-events: none;
 }
 
 .LabelList-lookupTags--disabled {

From 8997fca45707821112bb83d0bbeb9164f2db8990 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 20 Nov 2018 11:41:58 -0500
Subject: [PATCH 2/2] add sanitize

---
 .../instance-groups-multiselect/instance-groups.partial.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html
index 7dc4dc4b45..878b54a3a4 100644
--- a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html
+++ b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html
@@ -12,7 +12,7 @@
             <at-tag tag="tag.name" remove-tag="deleteTag(tag)"></at-tag>
         </div>
         <div ng-if="fieldIsDisabled" class="LabelList-tag" ng-repeat="tag in instanceGroupsTags">
-            <span class="LabelList-name">{{tag.name}}</span>
+            <span class="LabelList-name">{{tag.name | sanitize}}</span>
         </div>
     </span>
 </div>