External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4719 from mabashian/4659-workflow-inv

Browse Source 
Corrected the inventory list endpoint in the workflow maker form
This commit is contained in:
Michael Abashian 2017-01-13 14:32:10 -05:00 committed by GitHub
commit 088ebdfd5c
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/lists/InventorySources.js
View File

@ -18,9 +18,13 @@ export default
fields: {
name: {
key: true,
label: 'Name',
columnClass: 'col-md-11'
ngBind: 'inventory_source.summary_fields.group.name',
columnClass: 'col-md-11',
simpleTip: {
awToolTip: "Inventory: {{inventory_source.summary_fields.inventory.name}}",
dataPlacement: "top"
}
}
},

6
awx/ui/client/src/shared/generator-helpers.js
View File

@ -591,6 +591,9 @@ angular.module('GeneratorHelpers', [systemStatus.name])
}
}
else {
if(field.simpleTip) {
html += `<span aw-tool-tip="${field.simpleTip.awToolTip}" data-placement=${field.simpleTip.dataPlacement}>`;
}
// Add icon:
if (field.ngShowIcon) {
html += "<i ng-show=\"" + field.ngShowIcon + "\" class=\"" + field.icon + "\"></i> ";
@ -615,6 +618,9 @@ angular.module('GeneratorHelpers', [systemStatus.name])
if (field.text) {
html += field.text;
}
if(field.simpleTip) {
html += `</span>`;
}
}
if (list.name === 'hosts' || list.name === 'groups') {

3
awx/ui/client/src/templates/main.js
View File

@ -103,7 +103,8 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA
},
inventory_source_search: {
value: {
page_size: '5'
page_size: '5',
not__source: ''
},
squash: true,
dynamic: true

4
awx/ui/tests/spec/workflows/workflow-add.controller-test.js
View File

@ -84,6 +84,10 @@ describe('Controller: WorkflowAdd', () => {
.whenGET('/api')
.respond(200, '');
$httpBackend
.whenGET(/\/static\/*/)
.respond(200, {});
TemplatesService.getLabelOptions = jasmine.createSpy('getLabelOptions').and.returnValue(getLabelsDeferred.promise);
TemplatesService.createWorkflowJobTemplate = jasmine.createSpy('createWorkflowJobTemplate').and.returnValue(createWorkflowJobTemplateDeferred.promise);