From 4134d0b51640c2913fd65895a8f0ed409f92f944 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Wed, 16 Oct 2019 08:36:22 -0400
Subject: [PATCH] Updates PR and Addresses Console Error

THis commit imroves conditional rendering of the container groups form for
System Auditors.  It also removes a ng-class condition in the IG list that was unused.
---
 awx/ui/client/lib/components/code-mirror/_index.less        | 6 ------
 .../container-groups/edit-container-group.controller.js     | 5 ++++-
 .../instance-groups/list/instance-groups-list.partial.html  | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/awx/ui/client/lib/components/code-mirror/_index.less b/awx/ui/client/lib/components/code-mirror/_index.less
index d0e2d970e8..98c258d528 100644
--- a/awx/ui/client/lib/components/code-mirror/_index.less
+++ b/awx/ui/client/lib/components/code-mirror/_index.less
@@ -52,12 +52,6 @@
     height: calc(~"100vh - 80px");
 }
 
-textarea[disabled] + div .CodeMirror-code{
-    background-color: #ebebeb;
-    cursor: not-allowed;
-}
-
-
 @media screen and (min-width: 768px){
 	.NetworkingExtraVars .modal-dialog{
 		width: 700px;
diff --git a/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js b/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
index 76559e37fd..33d50cb758 100644
--- a/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
+++ b/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
@@ -4,7 +4,10 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
     instanceGroup,
     credential
   } = models;
-  const canEdit = instanceGroup.model.OPTIONS.actions.PUT;
+  let canEdit = false;
+  if (instanceGroup.has('options', 'actions.PUT')) {
+    canEdit = instanceGroup.model.OPTIONS.actions.PUT;
+}
   if (!instanceGroup.get('is_containerized')) {
       return $state.go(
           'instanceGroups.edit',
diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
index 88537cee03..b8d5fdfbc3 100644
--- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
+++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
@@ -101,7 +101,7 @@
                         </div>
                         <div class="at-Row-actions" >
                             <capacity-bar ng-show="!instance_group.credential" label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_USED_CAPACITY') }}" capacity="instance_group.consumed_capacity" total-capacity="instance_group.capacity"></capacity-bar>
-                            <at-row-action ng-class="{'at-Row-actions-noCredential': !instance_group.credential}" icon="fa-trash" ng-click="vm.deleteInstanceGroup(instance_group)" ng-if="vm.rowAction.trash(instance_group)">
+                            <at-row-action icon="fa-trash" ng-click="vm.deleteInstanceGroup(instance_group)" ng-if="vm.rowAction.trash(instance_group)">
                             </at-row-action>
                         </div>
                         </div>