mirror of
https://github.com/ansible/awx.git
synced 2024-10-30 22:21:13 +03:00
AC-976 add job template name to activity stream
This commit is contained in:
parent
d57b2f7926
commit
7580b91186
@ -301,10 +301,17 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
|
||||
if (scope[iterator + 'SearchValue' + modifier]) {
|
||||
// A search value was entered
|
||||
scope[iterator + 'ShowStartBtn' + modifier] = false;
|
||||
scope[iterator + 'SearchParams'] += '&' +
|
||||
if (list.fields[scope[iterator + 'SearchField' + modifier]].searchOnID) {
|
||||
scope[iterator + 'SearchParams'] += '&' +
|
||||
list.fields[scope[iterator + 'SearchField' + modifier]].searchObject +
|
||||
'__name__icontains=' +
|
||||
scope[iterator + 'SearchValue' + modifier];
|
||||
'__id=' + scope[iterator + 'SearchValue' + modifier];
|
||||
}
|
||||
else {
|
||||
scope[iterator + 'SearchParams'] += '&' +
|
||||
list.fields[scope[iterator + 'SearchField' + modifier]].searchObject +
|
||||
'__name__icontains=' +
|
||||
scope[iterator + 'SearchValue' + modifier];
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Search value is empty
|
||||
|
@ -102,6 +102,15 @@ angular.module('StreamListDefinition', [])
|
||||
searchWidget: 2,
|
||||
searchField: 'object1'
|
||||
},
|
||||
job_search: {
|
||||
label: 'Job',
|
||||
searchOnly: true,
|
||||
searchObject: 'job',
|
||||
searchPlaceholder: 'Job id',
|
||||
searchOnID: true,
|
||||
searchWidget: 2,
|
||||
searchField: 'object1'
|
||||
},
|
||||
organization_search: {
|
||||
label: 'Organization',
|
||||
searchOnly: true,
|
||||
@ -169,6 +178,15 @@ angular.module('StreamListDefinition', [])
|
||||
searchWidget: 3,
|
||||
searchField: 'object2'
|
||||
},
|
||||
job_search3: {
|
||||
label: 'Job',
|
||||
searchOnly: true,
|
||||
searchObject: 'job',
|
||||
searchPlaceholder: 'Job id',
|
||||
searchOnID: true,
|
||||
searchWidget: 3,
|
||||
searchField: 'object2'
|
||||
},
|
||||
job_template_search3: {
|
||||
label: 'Job Template',
|
||||
searchOnly: true,
|
||||
|
@ -182,7 +182,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
|
||||
descr += obj2 + name + ( (activity.operation == 'disassociate') ? ' from ' : ' to ' );
|
||||
descr_nolink += obj2 + name + ( (activity.operation == 'disassociate') ? ' from ' : ' to ' );
|
||||
}
|
||||
if (obj2_obj && obj1_obj.name && !/^\_delete/.test(obj1_obj.name)) {
|
||||
if (obj1_obj && obj1_obj.name && !/^\_delete/.test(obj1_obj.name)) {
|
||||
obj1_obj['base'] = obj1;
|
||||
descr += obj1 + ' <a href=\"' + BuildUrl(obj1_obj) + '\">' + obj1_obj.name + '</a>';
|
||||
descr_nolink += obj1 + ' ' + obj1_obj.name;
|
||||
@ -190,13 +190,34 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
|
||||
else if (obj1) {
|
||||
name = '';
|
||||
// find the name in changes, if needed
|
||||
if ( ((!(obj1_obj && obj1_obj.name)) || obj1_obj && obj1_obj.name && /^_delete/.test(obj1_obj.name))
|
||||
&& (activity.changes && activity.changes.name) ) {
|
||||
if (typeof activity.changes.name == 'string') {
|
||||
name = ' ' + activity.changes.name;
|
||||
if ( !(obj1_obj && obj1_obj.name) || obj1_obj && obj1_obj.name && /^_delete/.test(obj1_obj.name) ) {
|
||||
if (activity.changes && activity.changes.name) {
|
||||
if (typeof activity.changes.name == 'string') {
|
||||
name = ' ' + activity.changes.name;
|
||||
}
|
||||
else if (typeof activity.changes.name == 'object' && Array.isArray(activity.changes.name)) {
|
||||
name = ' ' + activity.changes.name[0]
|
||||
}
|
||||
}
|
||||
else if (typeof activity.changes.name == 'object' && Array.isArray(activity.changes.name)) {
|
||||
name = ' ' + activity.changes.name[0]
|
||||
else if (obj1 == 'job' && obj1_obj && activity.changes && activity.changes.job_template) {
|
||||
// Hack for job activity where the template name is known
|
||||
if (activity.operation != 'delete') {
|
||||
obj1_obj['base'] = obj1;
|
||||
name = ' ' + '<a href=\"' + BuildUrl(obj1_obj) + '\">'+ obj1_obj.id + ' ' + activity.changes.job_template + '</a>';
|
||||
}
|
||||
else {
|
||||
name = ' ' + obj1_obj.id + ' ' + activity.changes.job_template;
|
||||
}
|
||||
}
|
||||
else if (obj1 == 'job' && obj1_obj) {
|
||||
// Hack for job activity where template name not known
|
||||
if (activity.operation != 'delete') {
|
||||
obj1_obj['base'] = obj1;
|
||||
name = ' ' + '<a href=\"' + BuildUrl(obj1_obj) + '\">' + obj1_obj.id + '</a>';
|
||||
}
|
||||
else {
|
||||
name = ' ' + obj1_obj.id;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (obj1_obj && obj1_obj.name) {
|
||||
|
Loading…
Reference in New Issue
Block a user