External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 18:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Updates PR and Addresses Console Error

Browse Source 
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.
This commit is contained in:
Alex Corey
2019-10-16 08:36:22 -04:00
parent 5cf84ddb60
commit 4134d0b516
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/lib/components/code-mirror/_index.less
View File

@@ -52,12 +52,6 @@
height: calc(~"100vh - 80px"); height: calc(~"100vh - 80px");
} }
textarea[disabled] + div .CodeMirror-code{
background-color: #ebebeb;
cursor: not-allowed;
}
@media screen and (min-width: 768px){ @media screen and (min-width: 768px){
.NetworkingExtraVars .modal-dialog{ .NetworkingExtraVars .modal-dialog{
width: 700px; width: 700px;

5
awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
View File

@@ -4,7 +4,10 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
instanceGroup, instanceGroup,
credential credential
} = models; } = 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')) { if (!instanceGroup.get('is_containerized')) {
return $state.go( return $state.go(
'instanceGroups.edit', 'instanceGroups.edit',

2
awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
View File

@@ -101,7 +101,7 @@
</div> </div>
<div class="at-Row-actions" > <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> <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> </at-row-action>
</div> </div>
</div> </div>