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

make org related lists searchable on the correct base

Browse Source
This commit is contained in:
John Mitchell
2016-05-16 13:45:34 -04:00
parent 1bedc5dacc
commit 18e3552c86
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js
View File

@@ -71,9 +71,9 @@ export default ['$compile', '$scope', '$stateParams', '$state', 'Rest', 'UserLis
var listMode = (mode === 'admins') ? 'users' : mode; var listMode = (mode === 'admins') ? 'users' : mode;
list = getList(mode); list = getList(mode);
list.listTitle = listTitle;
url = getUrl(mode, data); url = getUrl(mode, data);
list.listTitle = listTitle;
list.basePath = url;
$scope.orgRelatedUrls = data.related; $scope.orgRelatedUrls = data.related;

6
awx/ui/client/src/search/getSearchHtml.service.js
View File

@@ -31,7 +31,11 @@ export default ['GetBasePath', function(GetBasePath) {
if (endPoint === 'inventories') { if (endPoint === 'inventories') {
endPoint = 'inventory'; endPoint = 'inventory';
} }
return GetBasePath(endPoint); if (endPoint.indexOf("/api/v1") > -1) {
return endPoint;
} else {
return GetBasePath(endPoint);
}
}; };
// inject the directive with the list and endpoint // inject the directive with the list and endpoint