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

Adds org column to the application lookup modal, while on tokens form

Browse Source
This commit is contained in:
Jared Tabor
2018-07-06 13:34:04 -07:00
parent 8a2be07ccb
commit a30e2f93a6
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui/client/features/users/tokens/users-tokens-add-application.route.js
View File

@@ -42,14 +42,19 @@ export default {
name: { name: {
key: true, key: true,
label: 'Name', label: 'Name',
columnClass: 'col-lg-4 col-md-6 col-sm-8 col-xs-8', columnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-4',
awToolTip: '{{application.description | sanitize}}', awToolTip: '{{application.description | sanitize}}',
dataPlacement: 'top' dataPlacement: 'top'
}, },
}, organization: {
actions: { label: 'Organization',
}, columnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-4',
fieldActions: { modalColumnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-4',
key: false,
ngBind: 'application.summary_fields.organization.name',
sourceModel: 'organization',
includeModal: true
}
} }
})], })],
Dataset: ['QuerySet', 'GetBasePath', '$stateParams', 'ListDefinition', Dataset: ['QuerySet', 'GetBasePath', '$stateParams', 'ListDefinition',

9
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@@ -545,6 +545,8 @@ export default ['$compile', 'Attr', 'Icon',
} }
} }
if (options.mode === 'lookup') { if (options.mode === 'lookup') {
for (fld in list.fields) {
if(fld === 'name' || _.has(list.fields[fld], 'includeModal')){
let customClass = list.fields.name.modalColumnClass || ''; let customClass = list.fields.name.modalColumnClass || '';
html += `<th html += `<th
base-path="${list.basePath || list.name}" base-path="${list.basePath || list.name}"
@@ -554,13 +556,16 @@ export default ['$compile', 'Attr', 'Icon',
column-field="name" column-field="name"
column-iterator="${list.iterator}" column-iterator="${list.iterator}"
column-no-sort="${list.fields.name.nosort}" column-no-sort="${list.fields.name.nosort}"
column-label="${list.fields.name.label}" column-label="${list.fields[fld].label}"
column-custom-class="${customClass}" column-custom-class="${customClass}"
query-set="${list.iterator}_queryset"> query-set="${list.iterator}_queryset">
</th>`; </th>`;
}
}
if(list.fields.info) { if(list.fields.info) {
customClass = list.fields.name.modalColumnClass || ''; let customClass = list.fields.name.modalColumnClass || '';
const infoHeaderClass = _.get(list.fields.info, 'infoHeaderClass', 'List-tableHeader--info'); const infoHeaderClass = _.get(list.fields.info, 'infoHeaderClass', 'List-tableHeader--info');
html += `<th html += `<th
class="${infoHeaderClass}" class="${infoHeaderClass}"