diff --git a/awx/ui/static/js/controllers/Schedules.js b/awx/ui/static/js/controllers/Schedules.js index 9df9b2763f..e018ae4d5a 100644 --- a/awx/ui/static/js/controllers/Schedules.js +++ b/awx/ui/static/js/controllers/Schedules.js @@ -11,7 +11,7 @@ 'use strict'; 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(); @@ -78,6 +78,10 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get $scope.search(SchedulesList.iterator); }; + $scope.showActivity = function () { + Stream({ scope: $scope }); + }; + Wait('start'); GetChoices({ @@ -90,4 +94,4 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get } ScheduleEditController.$inject = [ '$scope', '$compile', '$location', '$routeParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', - 'GetBasePath', 'Wait', 'Breadcrumbs', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices' ]; \ No newline at end of file + 'GetBasePath', 'Wait', 'Breadcrumbs', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices', 'Stream' ]; \ No newline at end of file diff --git a/awx/ui/static/js/lists/Streams.js b/awx/ui/static/js/lists/Streams.js index acf91fd9ca..58afe97699 100644 --- a/awx/ui/static/js/lists/Streams.js +++ b/awx/ui/static/js/lists/Streams.js @@ -129,6 +129,14 @@ angular.module('StreamListDefinition', []) searchWidget: 2, searchField: 'object1' }, + schedule_search: { + label: 'Schedule', + searchOnly: true, + searchObject: 'schedule', + searchPlaceholder: 'Schedule name', + searchWidget: 2, + searchField: 'object1' + }, user_search: { label: 'User', searchOnly: true, @@ -213,6 +221,14 @@ angular.module('StreamListDefinition', []) searchWidget: 3, searchField: 'object2' }, + schedule_search3: { + label: 'Schedule', + searchOnly: true, + searchObject: 'schedule', + searchPlaceholder: 'Schedule name', + searchWidget: 3, + searchField: 'object1' + }, user_search3: { label: 'User', searchOnly: true,