shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

AC-1127 connected activity stream to schedules.

Browse Source
This commit is contained in:
Chris Houseknecht 2014-04-05 03:30:18 -04:00
parent 8d65808f85
commit 6540380cc9
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/static/js/controllers/Schedules.js
View File

@ -11,7 +11,7 @@
'use strict'; 'use strict';
function ScheduleEditController($scope, $compile, $location, $routeParams, SchedulesList, Rest, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, function ScheduleEditController($scope, $compile, $location, $routeParams, SchedulesList, Rest, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope,
GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices) { GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices, Stream) {
ClearScope(); ClearScope();
@ -78,6 +78,10 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get
$scope.search(SchedulesList.iterator); $scope.search(SchedulesList.iterator);
}; };
$scope.showActivity = function () {
Stream({ scope: $scope });
};
Wait('start'); Wait('start');
GetChoices({ GetChoices({
@ -90,4 +94,4 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get
} }
ScheduleEditController.$inject = [ '$scope', '$compile', '$location', '$routeParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', ScheduleEditController.$inject = [ '$scope', '$compile', '$location', '$routeParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope',
'GetBasePath', 'Wait', 'Breadcrumbs', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices' ]; 'GetBasePath', 'Wait', 'Breadcrumbs', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices', 'Stream' ];

16
awx/ui/static/js/lists/Streams.js
View File

@ -129,6 +129,14 @@ angular.module('StreamListDefinition', [])
searchWidget: 2, searchWidget: 2,
searchField: 'object1' searchField: 'object1'
}, },
schedule_search: {
label: 'Schedule',
searchOnly: true,
searchObject: 'schedule',
searchPlaceholder: 'Schedule name',
searchWidget: 2,
searchField: 'object1'
},
user_search: { user_search: {
label: 'User', label: 'User',
searchOnly: true, searchOnly: true,
@ -213,6 +221,14 @@ angular.module('StreamListDefinition', [])
searchWidget: 3, searchWidget: 3,
searchField: 'object2' searchField: 'object2'
}, },
schedule_search3: {
label: 'Schedule',
searchOnly: true,
searchObject: 'schedule',
searchPlaceholder: 'Schedule name',
searchWidget: 3,
searchField: 'object1'
},
user_search3: { user_search3: {
label: 'User', label: 'User',
searchOnly: true, searchOnly: true,