External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2753 from jlmitch5/fixInstanceGroupLookup

Browse Source 
fix instance group lookup in orgs scrolling behavior

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-11-20 20:05:14 +00:00
committed by GitHub
parent 29e4160d3e 8997fca457
commit bfe86cbc95
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html
View File

@@ -1,14 +1,18 @@
<div class="input-group Form-mixedInputGroup"> <div class="input-group Form-mixedInputGroup">
<span class="input-group-btn"> <span class="input-group-btn Form-variableHeightButtonGroup">
<button type="button" class="Form-lookupButton btn btn-default" ng-click="openInstanceGroupsModal()" <button type="button" class="Form-lookupButton Form-lookupButton--variableHeight btn btn-default" ng-click="openInstanceGroupsModal()"
ng-disabled="fieldIsDisabled"> ng-disabled="fieldIsDisabled">
<i class="fa fa-search"></i> <i class="fa fa-search"></i>
</button> </button>
</span> </span>
<span id="InstanceGroups" class="form-control Form-textInput Form-textInput--variableHeight input-medium lookup LabelList-lookupTags" <span id="InstanceGroups" class="form-control Form-textInput Form-textInput--variableHeight input-medium lookup LabelList-lookupTags"
ng-disabled="fieldIsDisabled"> ng-disabled="fieldIsDisabled"
<div class="LabelList-tagContainer" ng-repeat="tag in instanceGroupsTags"> 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> <at-tag tag="tag.name" remove-tag="deleteTag(tag)"></at-tag>
</div> </div>
<div ng-if="fieldIsDisabled" class="LabelList-tag" ng-repeat="tag in instanceGroupsTags">
<span class="LabelList-name">{{tag.name | sanitize}}</span>
</div>
</span> </span>
</div> </div>

5
awx/ui/client/src/templates/labels/labelsList.block.less
View File

@@ -92,11 +92,6 @@
.LabelList-lookupTags { .LabelList-lookupTags {
display: flex; display: flex;
padding: 0 12px; padding: 0 12px;
overflow-y: hidden;
}
.LabelList-lookupTags[disabled] {
pointer-events: none;
} }
.LabelList-lookupTags--disabled { .LabelList-lookupTags--disabled {