mirror of
https://github.com/ansible/awx.git
synced 2026-05-19 14:57:39 -02:30
AC-611 Latest activity widget features. Tweaked current filter, but still does not include an object type. Added activty stream to Organization tab.
This commit is contained in:
@@ -35,6 +35,15 @@ angular.module('OrganizationListDefinition', [])
|
||||
ngClick: 'addOrganization()',
|
||||
"class": 'btn-success btn-xs',
|
||||
awToolTip: 'Create a new organization'
|
||||
},
|
||||
stream: {
|
||||
'class': "btn-primary btn-xs activity-btn",
|
||||
ngClick: "showActivity()",
|
||||
awToolTip: "View Activity Stream",
|
||||
dataPlacement: "top",
|
||||
icon: "icon-comments-alt",
|
||||
mode: 'all',
|
||||
iconSize: 'large'
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -19,23 +19,45 @@ angular.module('StreamListDefinition', [])
|
||||
"class": "table-condensed",
|
||||
|
||||
fields: {
|
||||
timestamp: {
|
||||
label: 'Event Time',
|
||||
key: true,
|
||||
desc: true,
|
||||
noLink: true,
|
||||
searchable: false
|
||||
},
|
||||
user: {
|
||||
label: 'User',
|
||||
linkTo: "\{\{ activity.userLink \}\}",
|
||||
ngBindHtml: 'activity.user',
|
||||
sourceModel: 'user',
|
||||
sourceField: 'username',
|
||||
awToolTip: "\{\{ userToolTip \}\}",
|
||||
dataPlacement: 'top'
|
||||
},
|
||||
timestamp: {
|
||||
label: 'Event Time',
|
||||
},
|
||||
objects: {
|
||||
label: 'Objects',
|
||||
ngBindHtml: 'activity.objects'
|
||||
ngBindHtml: 'activity.objects',
|
||||
sortField: "object1__name,object2__name",
|
||||
searchable: false
|
||||
},
|
||||
object_name: {
|
||||
label: 'Object name',
|
||||
searchOnly: true,
|
||||
searchType: 'or',
|
||||
searchFields: ['object1__name', 'object2__name']
|
||||
},
|
||||
description: {
|
||||
label: 'Description'
|
||||
label: 'Description',
|
||||
ngBindHtml: 'activity.description',
|
||||
nosort: true,
|
||||
searchable: false
|
||||
},
|
||||
system_event: {
|
||||
label: 'System event?',
|
||||
searchOnly: true,
|
||||
searchType: 'isnull',
|
||||
sourceModel: 'user',
|
||||
sourceField: 'username'
|
||||
}
|
||||
},
|
||||
|
||||
@@ -61,5 +83,14 @@ angular.module('StreamListDefinition', [])
|
||||
},
|
||||
|
||||
fieldActions: {
|
||||
edit: {
|
||||
label: 'View',
|
||||
ngClick: "showDetail(\{\{ activity.id \}\})",
|
||||
icon: 'icon-zoom-in',
|
||||
"class": 'btn-default btn-xs',
|
||||
awToolTip: 'View event details',
|
||||
dataPlacement: 'top'
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
Reference in New Issue
Block a user