External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5186 from jaredevantabor/smart-search

Browse Source 
Smart search, and invalid searches
This commit is contained in:
Jared Tabor
2017-02-08 12:00:02 -08:00
committed by GitHub
parent a076ab015d 2a8bff824a
commit 29869f7093
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -264,13 +264,13 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear
this.error(response.data, response.status); this.error(response.data, response.status);
return response; throw response;
}.bind(this)); }.bind(this));
}, },
error(data, status) { error(data, status) {
ProcessErrors($rootScope, data, status, null, { ProcessErrors($rootScope, null, status, null, {
hdr: 'Error!', hdr: 'Error!',
msg: 'Call to ' + this.url + '. GET returned: ' + status msg: "Invalid search term entered."
}); });
} }
}; };

5
awx/ui/client/src/shared/smart-search/smart-search.controller.js
View File

@@ -182,8 +182,11 @@ export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', '
else { else {
encodeParams.searchTerm = true; encodeParams.searchTerm = true;
} }
removed = qs.encodeParam(encodeParams);
}
else {
removed = setDefaults(termParts[termParts.length-1]);
} }
removed = qs.encodeParam(encodeParams);
} }
removeFromQuerySet(queryset); removeFromQuerySet(queryset);
if(!$scope.querySet) { if(!$scope.querySet) {