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

Merge pull request #1105 from mabashian/1023-activity-stream-inv-link

Browse Source 
Fixed inventory links in activity stream
This commit is contained in:
Jake McDermott
2018-02-01 18:23:54 -05:00
committed by GitHub
parent d01e6ab8b6 83aa7bfac4
commit ecacf64c28
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
View File

@@ -20,10 +20,10 @@ export default function BuildAnchor($log, $filter) {
if (activity.operation === 'create' || activity.operation === 'delete'){ if (activity.operation === 'create' || activity.operation === 'delete'){
// the API formats the changes.inventory field as str 'myInventoryName-PrimaryKey' // the API formats the changes.inventory field as str 'myInventoryName-PrimaryKey'
var inventory_id = _.last(activity.changes.inventory.split('-')); var inventory_id = _.last(activity.changes.inventory.split('-'));
url += 'inventories/' + inventory_id + '/groups/edit/' + activity.changes.id; url += 'inventories/inventory/' + inventory_id + '/groups/edit/' + activity.changes.id;
} }
else { else {
url += 'inventories/' + activity.summary_fields.inventory[0].id + '/groups/edit/' + (activity.changes.id || activity.changes.object1_pk); url += 'inventories/inventory/' + activity.summary_fields.inventory[0].id + '/groups/edit/' + (activity.changes.id || activity.changes.object1_pk);
} }
break; break;
case 'host': case 'host':
@@ -33,7 +33,7 @@ export default function BuildAnchor($log, $filter) {
url += 'jobs/' + obj.id; url += 'jobs/' + obj.id;
break; break;
case 'inventory': case 'inventory':
url += 'inventories/' + obj.id + '/'; url += obj.kind && obj.kind === "smart" ? 'inventories/smart/' + obj.id + '/' : 'inventories/inventory' + obj.id + '/';
break; break;
case 'schedule': case 'schedule':
// schedule urls depend on the resource they're associated with // schedule urls depend on the resource they're associated with