External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 13:41:28 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'remove-old-stream-code' into devel

Browse Source
This commit is contained in:
Michael Abashian 2016-02-11 11:06:09 -05:00
commit dd9db63519
13 changed files with 46 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
awx/ui/client/src/controllers/Credentials.js
View File

@ -14,7 +14,7 @@
export function CredentialsList($scope, $rootScope, $location, $log,
$stateParams, Rest, Alert, CredentialList, GenerateList, Prompt, SearchInit,
PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
SelectionInit, GetChoices, Wait, Stream, $state) {
SelectionInit, GetChoices, Wait, $state) {
ClearScope();
@ -88,11 +88,6 @@ export function CredentialsList($scope, $rootScope, $location, $log,
callback: 'choicesReadyCredential'
});
$scope.showActivity = function () {
Stream({ scope: $scope });
};
$scope.addCredential = function () {
$state.transitionTo('credentials.add');
};
@ -130,7 +125,7 @@ CredentialsList.$inject = ['$scope', '$rootScope', '$location', '$log',
'$stateParams', 'Rest', 'Alert', 'CredentialList', 'generateList', 'Prompt',
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'GetChoices', 'Wait',
'Stream', '$state'
'$state'
];
@ -310,7 +305,7 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log,
$stateParams, CredentialForm, GenerateForm, Rest, Alert, ProcessErrors,
RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, Prompt,
GetBasePath, GetChoices, KindChange, UserList, TeamList, LookUpInit, Empty,
OwnerChange, FormSave, Stream, Wait, $state) {
OwnerChange, FormSave, Wait, $state) {
ClearScope();
@ -502,9 +497,6 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log,
field: 'become_method',
variable: 'become_options'
});
$scope.showActivity = function () {
Stream({ scope: $scope });
};
// Save changes to the parent
$scope.formSave = function () {
@ -619,5 +611,5 @@ CredentialsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location',
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit',
'ReturnToCaller', 'ClearScope', 'Prompt', 'GetBasePath', 'GetChoices',
'KindChange', 'UserList', 'TeamList', 'LookUpInit', 'Empty', 'OwnerChange',
'FormSave', 'Stream', 'Wait', '$state'
'FormSave', 'Wait', '$state'
];

31
awx/ui/client/src/controllers/Home.js
View File

@ -22,7 +22,7 @@
*/
export function Home($scope, $compile, $stateParams, $rootScope, $location, $log, Wait,
ClearScope, Stream, Rest, GetBasePath, ProcessErrors, $window, graphData){
ClearScope, Rest, GetBasePath, ProcessErrors, $window, graphData){
ClearScope('home');
@ -103,13 +103,6 @@ export function Home($scope, $compile, $stateParams, $rootScope, $location, $log
$scope.$emit('dashboardDataLoadComplete');
});
$scope.showActivity = function () {
Stream({
scope: $scope
});
};
$scope.refresh = function () {
Wait('start');
Rest.setUrl(GetBasePath('dashboard'));
@ -145,7 +138,7 @@ export function Home($scope, $compile, $stateParams, $rootScope, $location, $log
}
Home.$inject = ['$scope', '$compile', '$stateParams', '$rootScope', '$location', '$log','Wait',
'ClearScope', 'Stream', 'Rest', 'GetBasePath', 'ProcessErrors', '$window', 'graphData'
'ClearScope', 'Rest', 'GetBasePath', 'ProcessErrors', '$window', 'graphData'
];
@ -157,7 +150,7 @@ Home.$inject = ['$scope', '$compile', '$stateParams', '$rootScope', '$location',
*
*/
export function HomeGroups($rootScope, $log, $scope, $filter, $compile, $location, $stateParams, LogViewer, HomeGroupList, GenerateList, ProcessErrors, ReturnToCaller, ClearScope,
GetBasePath, SearchInit, PaginateInit, FormatDate, GetHostsStatusMsg, GetSyncStatusMsg, ViewUpdateStatus, Stream, GroupsEdit, Wait,
GetBasePath, SearchInit, PaginateInit, FormatDate, GetHostsStatusMsg, GetSyncStatusMsg, ViewUpdateStatus, GroupsEdit, Wait,
Alert, Rest, Empty, InventoryUpdate, Find, GroupsCancelUpdate, Store) {
ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
@ -364,12 +357,6 @@ export function HomeGroups($rootScope, $log, $scope, $filter, $compile, $locatio
}
});
scope.showActivity = function () {
Stream({
scope: scope
});
};
scope.editGroup = function (group_id, inventory_id) {
PreviousSearchParams = Store('group_current_search_params');
GroupsEdit({
@ -579,7 +566,7 @@ export function HomeGroups($rootScope, $log, $scope, $filter, $compile, $locatio
HomeGroups.$inject = ['$rootScope', '$log', '$scope', '$filter', '$compile', '$location', '$stateParams', 'LogViewer', 'HomeGroupList', 'generateList', 'ProcessErrors', 'ReturnToCaller',
'ClearScope', 'GetBasePath', 'SearchInit', 'PaginateInit', 'FormatDate', 'GetHostsStatusMsg', 'GetSyncStatusMsg', 'ViewUpdateStatus',
'Stream', 'GroupsEdit', 'Wait', 'Alert', 'Rest', 'Empty', 'InventoryUpdate', 'Find', 'GroupsCancelUpdate', 'Store', 'Socket'
'GroupsEdit', 'Wait', 'Alert', 'Rest', 'Empty', 'InventoryUpdate', 'Find', 'GroupsCancelUpdate', 'Store', 'Socket'
];
/**
@ -591,7 +578,7 @@ HomeGroups.$inject = ['$rootScope', '$log', '$scope', '$filter', '$compile', '$l
*/
export function HomeHosts($scope, $location, $stateParams, HomeHostList, GenerateList, ProcessErrors, ReturnToCaller, ClearScope,
GetBasePath, SearchInit, PaginateInit, FormatDate, SetStatus, ToggleHostEnabled, HostsEdit, Stream, Find, ShowJobSummary, ViewJob) {
GetBasePath, SearchInit, PaginateInit, FormatDate, SetStatus, ToggleHostEnabled, HostsEdit, Find, ShowJobSummary, ViewJob) {
ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
//scope.
@ -664,12 +651,6 @@ export function HomeHosts($scope, $location, $stateParams, HomeHostList, Generat
ViewJob({ scope: $scope, id: id });
};
$scope.showActivity = function () {
Stream({
scope: $scope
});
};
$scope.toggleHostEnabled = function (id, sources) {
ToggleHostEnabled({
host_id: id,
@ -705,6 +686,6 @@ export function HomeHosts($scope, $location, $stateParams, HomeHostList, Generat
}
HomeHosts.$inject = ['$scope', '$location', '$stateParams', 'HomeHostList', 'generateList', 'ProcessErrors', 'ReturnToCaller',
'ClearScope', 'GetBasePath', 'SearchInit', 'PaginateInit', 'FormatDate', 'SetStatus', 'ToggleHostEnabled', 'HostsEdit', 'Stream',
'ClearScope', 'GetBasePath', 'SearchInit', 'PaginateInit', 'FormatDate', 'SetStatus', 'ToggleHostEnabled', 'HostsEdit',
'Find', 'ShowJobSummary', 'ViewJob'
];

67
awx/ui/client/src/controllers/Inventories.js
View File

@ -15,7 +15,7 @@ import '../job-templates/main';
export function InventoriesList($scope, $rootScope, $location, $log,
$stateParams, $compile, $filter, sanitizeFilter, Rest, Alert, InventoryList,
generateList, Prompt, SearchInit, PaginateInit, ReturnToCaller,
ClearScope, ProcessErrors, GetBasePath, Wait, Stream,
ClearScope, ProcessErrors, GetBasePath, Wait,
EditInventoryProperties, Find, Empty, LogViewer, $state) {
var list = InventoryList,
@ -301,10 +301,6 @@ export function InventoriesList($scope, $rootScope, $location, $log,
});
};
$scope.showActivity = function () {
Stream({ scope: $scope });
};
$scope.editInventoryProperties = function (inventory_id) {
EditInventoryProperties({ scope: $scope, inventory_id: inventory_id });
};
@ -368,7 +364,7 @@ export function InventoriesList($scope, $rootScope, $location, $log,
InventoriesList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', '$compile', '$filter', 'sanitizeFilter', 'Rest', 'Alert', 'InventoryList', 'generateList',
'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors',
'GetBasePath', 'Wait', 'Stream', 'EditInventoryProperties', 'Find', 'Empty', 'LogViewer', '$state'
'GetBasePath', 'Wait', 'EditInventoryProperties', 'Find', 'Empty', 'LogViewer', '$state'
];
@ -462,7 +458,7 @@ export function InventoriesEdit($scope, $rootScope, $compile, $location,
$log, $stateParams, InventoryForm, GenerateForm, Rest, Alert, ProcessErrors,
ReturnToCaller, ClearScope, generateList, OrganizationList, SearchInit,
PaginateInit, LookUpInit, GetBasePath, ParseTypeChange, Wait, ToJSON,
ParseVariableString, Stream, RelatedSearchInit, RelatedPaginateInit,
ParseVariableString, RelatedSearchInit, RelatedPaginateInit,
Prompt, PlaybookRun, CreateDialog, deleteJobTemplate, $state) {
ClearScope();
@ -590,10 +586,6 @@ export function InventoriesEdit($scope, $rootScope, $compile, $location,
$location.path($location.path() + '/manage');
};
$scope.showActivity = function () {
Stream({ scope: $scope });
};
$scope.formCancel = function () {
$state.transitionTo('inventories');
};
@ -776,7 +768,7 @@ InventoriesEdit.$inject = ['$scope', '$rootScope', '$compile', '$location',
'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'generateList',
'OrganizationList', 'SearchInit', 'PaginateInit', 'LookUpInit',
'GetBasePath', 'ParseTypeChange', 'Wait', 'ToJSON', 'ParseVariableString',
'Stream', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
'PlaybookRun', 'CreateDialog', 'deleteJobTemplate', '$state'
];
@ -788,7 +780,7 @@ export function InventoriesManage ($log, $scope, $rootScope, $location,
InjectHosts, Find, HostsReload, SearchInit, PaginateInit, GetSyncStatusMsg,
GetHostsStatusMsg, GroupsEdit, InventoryUpdate, GroupsCancelUpdate,
ViewUpdateStatus, GroupsDelete, Store, HostsEdit, HostsDelete,
EditInventoryProperties, ToggleHostEnabled, Stream, ShowJobSummary,
EditInventoryProperties, ToggleHostEnabled, ShowJobSummary,
InventoryGroupsHelp, HelpDialog, ViewJob,
GroupsCopy, HostsCopy, $stateParams) {
@ -1248,53 +1240,6 @@ export function InventoriesManage ($log, $scope, $rootScope, $location,
});
};
$scope.showGroupActivity = function () {
var url, title, group;
if ($scope.selected_group_id) {
url = GetBasePath('activity_stream') + '?group__id=' + $scope.selected_group_id;
title = 'Showing all activities for group ' + group.name;
} else {
title = 'Showing all activities for all ' + $scope.inventory.name + ' groups';
url = GetBasePath('activity_stream') + '?group__inventory__id=' + $scope.inventory.id;
}
Stream({
scope: $scope,
inventory_name: $scope.inventory.name,
url: url,
title: title,
search_iterator: 'group',
onClose: 'GroupStreamClosed'
});
};
if ($scope.removeGroupStreamClosed) {
$scope.removeGroupStreamClosed();
}
$scope.removeGroupStreamClosed = $scope.$on('GroupStreamClosed', function() {
$scope.refreshGroups();
});
hostScope.showHostActivity = function () {
var url, title;
title = 'Showing all activities for all ' + $scope.inventory.name + ' hosts';
url = GetBasePath('activity_stream') + '?host__inventory__id=' + $scope.inventory.id;
Stream({
scope: hostScope,
inventory_name: $scope.inventory.name,
url: url,
title: title,
search_iterator: 'host',
onClose: 'HostStreamClosed'
});
};
if (hostScope.removeHostStreamClosed) {
hostScope.removeHostStreamClosed();
}
hostScope.removeHostStreamClosed = hostScope.$on('HostStreamClosed', function() {
$scope.refreshGroups();
});
hostScope.showJobSummary = function (job_id) {
ShowJobSummary({
job_id: job_id
@ -1347,7 +1292,7 @@ InventoriesManage.$inject = ['$log', '$scope', '$rootScope', '$location',
'SearchInit', 'PaginateInit', 'GetSyncStatusMsg', 'GetHostsStatusMsg',
'GroupsEdit', 'InventoryUpdate', 'GroupsCancelUpdate', 'ViewUpdateStatus',
'GroupsDelete', 'Store', 'HostsEdit', 'HostsDelete',
'EditInventoryProperties', 'ToggleHostEnabled', 'Stream', 'ShowJobSummary',
'EditInventoryProperties', 'ToggleHostEnabled', 'ShowJobSummary',
'InventoryGroupsHelp', 'HelpDialog', 'ViewJob', 'GroupsCopy',
'HostsCopy', '$stateParams'
];

20
awx/ui/client/src/controllers/JobTemplates.js
View File

@ -15,7 +15,7 @@ export function JobTemplatesList($scope, $rootScope, $location, $log,
$stateParams, Rest, Alert, JobTemplateList, GenerateList, Prompt,
SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors,
GetBasePath, JobTemplateForm, CredentialList, LookUpInit, PlaybookRun,
Wait, Stream, CreateDialog, $compile, $state) {
Wait, CreateDialog, $compile, $state) {
ClearScope();
@ -58,12 +58,6 @@ export function JobTemplatesList($scope, $rootScope, $location, $log,
$scope.search(list.iterator);
$scope.showActivity = function () {
Stream({ scope: $scope });
};
$scope.addJobTemplate = function () {
$state.transitionTo('jobTemplates.add');
};
@ -246,7 +240,7 @@ JobTemplatesList.$inject = ['$scope', '$rootScope', '$location', '$log',
'$stateParams', 'Rest', 'Alert', 'JobTemplateList', 'generateList',
'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'JobTemplateForm', 'CredentialList',
'LookUpInit', 'PlaybookRun', 'Wait', 'Stream', 'CreateDialog' , '$compile',
'LookUpInit', 'PlaybookRun', 'Wait', 'CreateDialog' , '$compile',
'$state'
];
@ -684,7 +678,7 @@ export function JobTemplatesEdit($filter, $scope, $rootScope, $compile,
ProcessErrors, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller,
ClearScope, InventoryList, CredentialList, ProjectList, LookUpInit,
GetBasePath, md5Setup, ParseTypeChange, JobStatusToolTip, FormatDate, Wait,
Stream, Empty, Prompt, ParseVariableString, ToJSON, SchedulesControllerInit,
Empty, Prompt, ParseVariableString, ToJSON, SchedulesControllerInit,
JobsControllerInit, JobsListUpdate, GetChoices, SchedulesListInit,
SchedulesList, CallbackHelpInit, PlaybookRun, SurveyControllerInit, $state){
@ -1157,12 +1151,6 @@ export function JobTemplatesEdit($filter, $scope, $rootScope, $compile,
};
$scope.showActivity = function () {
Stream({
scope: $scope
});
};
$scope.formCancel = function () {
$state.transitionTo('jobTemplates');
};
@ -1245,7 +1233,7 @@ JobTemplatesEdit.$inject = ['$filter', '$scope', '$rootScope', '$compile',
'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit',
'RelatedPaginateInit','ReturnToCaller', 'ClearScope', 'InventoryList',
'CredentialList', 'ProjectList', 'LookUpInit', 'GetBasePath', 'md5Setup',
'ParseTypeChange', 'JobStatusToolTip', 'FormatDate', 'Wait', 'Stream',
'ParseTypeChange', 'JobStatusToolTip', 'FormatDate', 'Wait',
'Empty', 'Prompt', 'ParseVariableString', 'ToJSON',
'SchedulesControllerInit', 'JobsControllerInit', 'JobsListUpdate',
'GetChoices', 'SchedulesListInit', 'SchedulesList', 'CallbackHelpInit',

18
awx/ui/client/src/controllers/Organizations.js
View File

@ -13,7 +13,7 @@
export function OrganizationsList($stateParams, $scope, $rootScope, $location,
$log, Rest, Alert, Prompt, ClearScope, ProcessErrors, GetBasePath, Wait,
Stream, $state) {
$state) {
ClearScope();
@ -111,10 +111,6 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location,
$('#prompt-modal').modal('hide');
});
$scope.showActivity = function () {
Stream({ scope: $scope });
};
$scope.addOrganization = function () {
$state.transitionTo('organizations.add');
};
@ -156,7 +152,7 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location,
OrganizationsList.$inject = ['$stateParams', '$scope', '$rootScope',
'$location', '$log', 'Rest', 'Alert', 'Prompt', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'Wait',
'Stream', '$state'
'$state'
];
@ -217,7 +213,7 @@ OrganizationsAdd.$inject = ['$scope', '$rootScope', '$compile', '$location',
export function OrganizationsEdit($scope, $rootScope, $compile, $location, $log,
$stateParams, OrganizationForm, GenerateForm, Rest, Alert, ProcessErrors,
RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath,
Wait, Stream, $state) {
Wait, $state) {
ClearScope();
@ -306,12 +302,6 @@ export function OrganizationsEdit($scope, $rootScope, $compile, $location, $log,
});
};
$scope.showActivity = function () {
Stream({
scope: $scope
});
};
$scope.formCancel = function () {
$scope.$emit("ReloadOrganzationCards");
$scope.$emit("ShowOrgListHeader");
@ -363,5 +353,5 @@ export function OrganizationsEdit($scope, $rootScope, $compile, $location, $log,
OrganizationsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location',
'$log', '$stateParams', 'OrganizationForm', 'GenerateForm', 'Rest', 'Alert',
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
'ClearScope', 'GetBasePath', 'Wait', 'Stream', '$state'
'ClearScope', 'GetBasePath', 'Wait', '$state'
];

4
awx/ui/client/src/controllers/Portal.js
View File

@ -19,7 +19,7 @@
*
*
*/
export function PortalController($scope, $compile, $stateParams, $rootScope, $location, $log, Wait, ClearScope, Stream, Rest, GetBasePath, ProcessErrors,
export function PortalController($scope, $compile, $stateParams, $rootScope, $location, $log, Wait, ClearScope, Rest, GetBasePath, ProcessErrors,
PortalJobsWidget, GenerateList, PortalJobTemplateList, SearchInit, PaginateInit, PlaybookRun){
ClearScope('portal');
@ -137,6 +137,6 @@ export function PortalController($scope, $compile, $stateParams, $rootScope, $lo
}
PortalController.$inject = ['$scope', '$compile', '$stateParams', '$rootScope', '$location', '$log','Wait', 'ClearScope', 'Stream', 'Rest', 'GetBasePath', 'ProcessErrors',
PortalController.$inject = ['$scope', '$compile', '$stateParams', '$rootScope', '$location', '$log','Wait', 'ClearScope', 'Rest', 'GetBasePath', 'ProcessErrors',
'PortalJobsWidget', 'generateList' , 'PortalJobTemplateList', 'SearchInit', 'PaginateInit', 'PlaybookRun'
];

16
awx/ui/client/src/controllers/Projects.js
View File

@ -14,7 +14,7 @@
export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
Rest, Alert, ProjectList, GenerateList, Prompt, SearchInit,
PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
SelectionInit, ProjectUpdate, Refresh, Wait, Stream, GetChoices, Empty,
SelectionInit, ProjectUpdate, Refresh, Wait, GetChoices, Empty,
Find, LogViewer, GetProjectIcon, GetProjectToolTip, $filter, $state) {
ClearScope();
@ -192,10 +192,6 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
callback: 'choicesReadyProjectList'
});
$scope.showActivity = function () {
Stream({ scope: $scope });
};
$scope.addProject = function () {
$state.transitionTo('projects.add');
};
@ -377,7 +373,7 @@ ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log',
'$stateParams', 'Rest', 'Alert', 'ProjectList', 'generateList', 'Prompt',
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'ProjectUpdate',
'Refresh', 'Wait', 'Stream', 'GetChoices', 'Empty', 'Find',
'Refresh', 'Wait', 'GetChoices', 'Empty', 'Find',
'LogViewer', 'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state'
];
@ -535,7 +531,7 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
$stateParams, ProjectsForm, GenerateForm, Rest, Alert, ProcessErrors,
RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath,
ReturnToCaller, GetProjectPath, Authorization, CredentialList, LookUpInit,
GetChoices, Empty, DebugForm, Wait, Stream, SchedulesControllerInit,
GetChoices, Empty, DebugForm, Wait, SchedulesControllerInit,
SchedulesListInit, SchedulesList, ProjectUpdate, $state) {
ClearScope('htmlTemplate');
@ -761,10 +757,6 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
});
};
$scope.showActivity = function () {
Stream({ scope: $scope });
};
// Related set: Add button
$scope.add = function (set) {
$rootScope.flashMessage = null;
@ -830,6 +822,6 @@ ProjectsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
'ClearScope', 'GetBasePath', 'ReturnToCaller', 'GetProjectPath',
'Authorization', 'CredentialList', 'LookUpInit', 'GetChoices', 'Empty',
'DebugForm', 'Wait', 'Stream', 'SchedulesControllerInit',
'DebugForm', 'Wait', 'SchedulesControllerInit',
'SchedulesListInit', 'SchedulesList', 'ProjectUpdate', '$state'
];

8
awx/ui/client/src/controllers/Schedules.js
View File

@ -12,7 +12,7 @@
export function ScheduleEditController($scope, $compile, $location, $stateParams, SchedulesList, Rest, ProcessErrors, ReturnToCaller, ClearScope,
GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices, Stream) {
GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices) {
ClearScope();
@ -70,10 +70,6 @@ GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices, Stre
$scope.search(SchedulesList.iterator);
};
$scope.showActivity = function () {
Stream({ scope: $scope });
};
Wait('start');
GetChoices({
@ -86,4 +82,4 @@ GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices, Stre
}
ScheduleEditController.$inject = [ '$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'ReturnToCaller', 'ClearScope',
'GetBasePath', 'Wait', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices', 'Stream' ];
'GetBasePath', 'Wait', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices'];

16
awx/ui/client/src/controllers/Teams.js
View File

@ -14,7 +14,7 @@
export function TeamsList($scope, $rootScope, $location, $log, $stateParams,
Rest, Alert, TeamList, GenerateList, Prompt, SearchInit, PaginateInit,
ReturnToCaller, ClearScope, ProcessErrors, SetTeamListeners, GetBasePath,
SelectionInit, Wait, Stream, $state, Refresh) {
SelectionInit, Wait, $state, Refresh) {
ClearScope();
@ -79,10 +79,6 @@ export function TeamsList($scope, $rootScope, $location, $log, $stateParams,
});
$scope.search(list.iterator);
$scope.showActivity = function () {
Stream({ scope: $scope });
};
$scope.addTeam = function () {
$state.transitionTo('teams.add');
};
@ -126,7 +122,7 @@ TeamsList.$inject = ['$scope', '$rootScope', '$location', '$log',
'$stateParams', 'Rest', 'Alert', 'TeamList', 'generateList', 'Prompt',
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'SetTeamListeners', 'GetBasePath', 'SelectionInit', 'Wait',
'Stream', '$state', 'Refresh'
'$state', 'Refresh'
];
@ -196,7 +192,7 @@ export function TeamsEdit($scope, $rootScope, $compile, $location, $log,
$stateParams, TeamForm, GenerateForm, Rest, Alert, ProcessErrors,
RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope,
LookUpInit, Prompt, GetBasePath, CheckAccess, OrganizationList, Wait,
Stream, fieldChoices, fieldLabels, permissionsSearchSelect, $state) {
fieldChoices, fieldLabels, permissionsSearchSelect, $state) {
ClearScope();
@ -327,10 +323,6 @@ export function TeamsEdit($scope, $rootScope, $compile, $location, $log,
}
};
$scope.showActivity = function () {
Stream({ scope: $scope });
};
// Save changes to the parent
$scope.formSave = function () {
var data = {}, fld;
@ -440,6 +432,6 @@ TeamsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
'$stateParams', 'TeamForm', 'GenerateForm', 'Rest', 'Alert',
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit',
'ReturnToCaller', 'ClearScope', 'LookUpInit', 'Prompt', 'GetBasePath',
'CheckAccess', 'OrganizationList', 'Wait', 'Stream', 'fieldChoices',
'CheckAccess', 'OrganizationList', 'Wait', 'fieldChoices',
'fieldLabels', 'permissionsSearchSelect', '$state'
];

16
awx/ui/client/src/controllers/Users.js
View File

@ -14,7 +14,7 @@
export function UsersList($scope, $rootScope, $location, $log, $stateParams,
Rest, Alert, UserList, GenerateList, Prompt, SearchInit, PaginateInit,
ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit,
Wait, Stream, $state, Refresh) {
Wait, $state, Refresh) {
ClearScope();
@ -71,10 +71,6 @@ export function UsersList($scope, $rootScope, $location, $log, $stateParams,
});
$scope.search(list.iterator);
$scope.showActivity = function () {
Stream({ scope: $scope });
};
$scope.addUser = function () {
$state.transitionTo('users.add');
};
@ -115,7 +111,7 @@ export function UsersList($scope, $rootScope, $location, $log, $stateParams,
UsersList.$inject = ['$scope', '$rootScope', '$location', '$log',
'$stateParams', 'Rest', 'Alert', 'UserList', 'generateList', 'Prompt',
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', 'Stream', '$state',
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', '$state',
'Refresh'
];
@ -226,7 +222,7 @@ UsersAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
export function UsersEdit($scope, $rootScope, $compile, $location, $log,
$stateParams, UserForm, GenerateForm, Rest, Alert, ProcessErrors,
RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope,
GetBasePath, Prompt, CheckAccess, ResetForm, Wait, Stream, fieldChoices,
GetBasePath, Prompt, CheckAccess, ResetForm, Wait, fieldChoices,
fieldLabels, permissionsSearchSelect, $state) {
ClearScope();
@ -399,10 +395,6 @@ export function UsersEdit($scope, $rootScope, $compile, $location, $log,
}
};
$scope.showActivity = function () {
Stream({ scope: $scope });
};
$scope.formCancel = function () {
$state.transitionTo('users');
};
@ -551,6 +543,6 @@ UsersEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
'$stateParams', 'UserForm', 'GenerateForm', 'Rest', 'Alert',
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit',
'ReturnToCaller', 'ClearScope', 'GetBasePath', 'Prompt', 'CheckAccess',
'ResetForm', 'Wait', 'Stream', 'fieldChoices', 'fieldLabels',
'ResetForm', 'Wait', 'fieldChoices', 'fieldLabels',
'permissionsSearchSelect', '$state'
];

8
awx/ui/client/src/inventory-scripts/list/list.controller.js
View File

@ -7,11 +7,11 @@
export default
[ '$rootScope','Wait', 'generateList', 'inventoryScriptsListObject',
'GetBasePath' , 'SearchInit' , 'PaginateInit',
'Rest' , 'ProcessErrors', 'Prompt', '$state', 'Stream',
'Rest' , 'ProcessErrors', 'Prompt', '$state',
function(
$rootScope,Wait, GenerateList, inventoryScriptsListObject,
GetBasePath, SearchInit, PaginateInit,
Rest, ProcessErrors, Prompt, $state, Stream
Rest, ProcessErrors, Prompt, $state
) {
var scope = $rootScope.$new(),
defaultUrl = GetBasePath('inventory_scripts'),
@ -49,10 +49,6 @@ export default
});
};
scope.showActivity = function () {
Stream({ scope: scope });
};
scope.deleteCustomInv = function(id, name){
var action = function () {

8
awx/ui/client/src/management-jobs/schedule/schedule.controller.js
View File

@ -13,10 +13,10 @@
export default [
'$scope', '$location', '$stateParams', 'SchedulesList', 'Rest',
'ProcessErrors', 'GetBasePath', 'Wait','LoadSchedulesScope', 'GetChoices',
'Stream', 'management_job', '$rootScope',
'management_job', '$rootScope',
function($scope, $location, $stateParams, SchedulesList, Rest,
ProcessErrors, GetBasePath, Wait, LoadSchedulesScope, GetChoices,
Stream, management_job, $rootScope) {
management_job, $rootScope) {
var base, id, url, parentObject;
$scope.management_job = management_job;
base = $location.path().replace(/^\//, '').split('/')[0];
@ -76,10 +76,6 @@ export default [
$scope.search(SchedulesList.iterator);
};
$scope.showActivity = function () {
Stream({ scope: $scope });
};
Wait('start');
GetChoices({

9
awx/ui/client/src/scheduler/scheduler.controller.js
View File

@ -13,11 +13,10 @@
export default [
'$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'ReturnToCaller', 'ClearScope',
'GetBasePath', 'Wait', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices', 'Stream',
'GetBasePath', 'Wait', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices',
function ($scope, $compile, $location, $stateParams,
SchedulesList, Rest, ProcessErrors, ReturnToCaller, ClearScope,
GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices,
Stream) {
GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices) {
ClearScope();
@ -79,10 +78,6 @@ export default [
$scope.search(SchedulesList.iterator);
};
$scope.showActivity = function () {
Stream({ scope: $scope });
};
Wait('start');
GetChoices({