External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-12 17:04:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'downstream' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2019-05-10 09:18:07 -04:00
parent 8725d3e539 466e965047
commit be4705ef8b
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/features/jobs/jobsList.controller.js
View File

@@ -64,13 +64,13 @@ function ListJobsController (
{ label: `${strings.get('sort.NAME_ASCENDING')}`, value: 'name' },
{ label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' },
{ label: `${strings.get('sort.FINISH_TIME_ASCENDING')}`, value: 'finished' },
toolbarSortDefault,
{ label: `${strings.get('sort.START_TIME_ASCENDING')}`, value: 'started' },
{ label: `${strings.get('sort.START_TIME_DESCENDING')}`, value: '-started' },
{ label: `${strings.get('sort.LAUNCHED_BY_ASCENDING')}`, value: 'created_by__id' },
{ label: `${strings.get('sort.LAUNCHED_BY_DESCENDING')}`, value: '-created_by__id' },
{ label: `${strings.get('sort.PROJECT_ASCENDING')}`, value: 'unified_job_template__project__id' },
{ label: `${strings.get('sort.PROJECT_DESCENDING')}`, value: '-unified_job_template__project__id' },
toolbarSortDefault
{ label: `${strings.get('sort.PROJECT_DESCENDING')}`, value: '-unified_job_template__project__id' }
];
vm.toolbarSortValue = toolbarSortDefault;

2
awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js
View File

@@ -15,7 +15,7 @@ export default ['i18n', function(i18n) {
hover: true,
trackBy: 'group.id',
basePath: 'api/v2/hosts/{{$stateParams.host_id}}/groups/',
layoutClass: 'List-staticColumnLayout--groups',
layoutClass: 'List-staticColumnLayout--statusOrCheckbox',
staticColumns: [
{
field: 'failed_hosts',

10
awx/ui/client/src/shared/smart-search/queryset.service.js
View File

@@ -1,7 +1,5 @@
function searchWithoutKey (term, singleSearchParam = null) {
if (singleSearchParam === 'host_filter') {
return { [singleSearchParam]: `${encodeURIComponent(term)}` };
} else if (singleSearchParam) {
if (singleSearchParam) {
return { [singleSearchParam]: `search=${encodeURIComponent(term)}` };
}
return { search: encodeURIComponent(term) };
@@ -418,7 +416,11 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
let termParams;
if (termParts.length === 1) {
termParams = searchWithoutKey(term, singleSearchParam);
if (singleSearchParam && termParts[0].toLowerCase() === "or") {
termParams = { [singleSearchParam]: "or" };
} else {
termParams = searchWithoutKey(term, singleSearchParam);
}
} else if ((isAnsibleFactField && isAnsibleFactField(termParts)) || (isFilterableBaseField && isFilterableBaseField(termParts))) {
termParams = this.encodeParam({ term, singleSearchParam, searchTerm: true });
} else if (isRelatedField && isRelatedField(termParts)) {