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

Merge pull request #2505 from mabashian/inventory-sync-stdout-linkback

Browse Source 
Removed link to /home/groups and replaced with inv manage link
This commit is contained in:
Michael Abashian 2016-06-20 13:42:13 -04:00 committed by GitHub
commit fa1608cef2
3 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html
View File

@ -18,7 +18,7 @@
<div class="StandardOut-detailsRow" ng-show="inventory_source_name">
<div class="StandardOut-detailsLabel">NAME</div>
<div class="StandardOut-detailsContent">
<a href="/#/home/groups?id={{ group }}">
<a href="{{inv_manage_group_link}}">
{{ inventory_source_name }}
</a>
</div>
@ -79,7 +79,7 @@
<div class="StandardOut-detailsRow" ng-show="inventory_source_name">
<div class="StandardOut-detailsLabel">GROUP</div>
<div class="StandardOut-detailsContent">
<a href="/#/home/groups?id={{ group }}">
<a href="{{inv_manage_group_link}}">
{{ inventory_source_name }}
</a>
</div>

1
awx/ui/client/src/standard-out/standard-out-factories/lookup-name.factory.js
View File

@ -15,6 +15,7 @@
.success(function(data) {
if (scope_var === 'inventory_source') {
scope[scope_var + '_name'] = data.summary_fields.group.name;
scope.inventory = data.inventory;
}
else if (!Empty(data.name)) {
scope[scope_var + '_name'] = data.name;

45
awx/ui/client/src/standard-out/standard-out.controller.js
View File

@ -42,8 +42,6 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams,
// Set the parse type so that CodeMirror knows how to display extra params YAML/JSON
$scope.parseType = 'yaml';
function getJobDetails() {
// Go out and get the job details based on the job type. jobType gets defined
@ -74,7 +72,6 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams,
$scope.variables = ParseVariableString(data.extra_vars);
}
// If we have a source then we have to go get the source choices from the server
if (!Empty(data.source)) {
if ($scope.removeChoicesReady) {
@ -150,6 +147,47 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams,
ParseTypeChange({ scope: $scope, field_id: 'pre-formatted-variables' });
}
if ($scope.job.type === 'inventory_update' && !$scope.inv_manage_group_link) {
var groupWatcher = $scope.$watch('group', function(group){
if(group) {
// The group's been set by the LookUpName call on inventory_source
var ancestorGroupIds = [];
// Remove the watcher
groupWatcher();
// Function that we'll call recursively to go out and get a groups parent(s)
var getGroupParent = function(groupId) {
Rest.setUrl(GetBasePath('base') + 'groups/?children__id=' + groupId);
Rest.get()
.success(function(data) {
if(data.results && data.results.length > 0) {
ancestorGroupIds.push(data.results[0].id);
// Go get this groups first parent
getGroupParent(data.results[0].id);
}
else {
// We've run out of ancestors to traverse - lets build a link (note that $scope.inventory is
// set in the lookup-name factory just like $scope.group)
$scope.inv_manage_group_link = '/#/inventories/' + $scope.inventory + '/manage';
for(var i=ancestorGroupIds.length; i > 0; i--) {
$scope.inv_manage_group_link += (i === ancestorGroupIds.length ? '?' : '&') + 'group=' + ancestorGroupIds[i-1];
}
}
})
.error(function(data, status) {
ProcessErrors($scope, data, status, null, { hdr: 'Error!',
msg: 'Failed to retrieve group parent(s): ' + groupId + '. GET returned: ' + status });
});
};
// Trigger the recursive chain of parent group gathering
getGroupParent(group);
}
});
}
// If the job isn't running we want to clear out the interval that goes out and checks for stdout updates.
// This interval is defined in the standard out log directive controller.
if (data.status === 'successful' || data.status === 'failed' || data.status === 'error' || data.status === 'canceled') {
@ -210,7 +248,6 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams,
RelaunchJob({ scope: $scope, id: typeId, type: job.type, name: job.name });
};
getJobDetails();
}