mirror of
https://github.com/ansible/awx.git
synced 2026-02-24 22:46:01 -03:30
Removed the Stream factory declaration where it is no longer needed. Removed from many of the controllers throughout the application.
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
export function CredentialsList($scope, $rootScope, $location, $log,
|
export function CredentialsList($scope, $rootScope, $location, $log,
|
||||||
$stateParams, Rest, Alert, CredentialList, GenerateList, Prompt, SearchInit,
|
$stateParams, Rest, Alert, CredentialList, GenerateList, Prompt, SearchInit,
|
||||||
PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
|
PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
|
||||||
SelectionInit, GetChoices, Wait, Stream, $state) {
|
SelectionInit, GetChoices, Wait, $state) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -88,11 +88,6 @@ export function CredentialsList($scope, $rootScope, $location, $log,
|
|||||||
callback: 'choicesReadyCredential'
|
callback: 'choicesReadyCredential'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.addCredential = function () {
|
$scope.addCredential = function () {
|
||||||
$state.transitionTo('credentials.add');
|
$state.transitionTo('credentials.add');
|
||||||
};
|
};
|
||||||
@@ -130,7 +125,7 @@ CredentialsList.$inject = ['$scope', '$rootScope', '$location', '$log',
|
|||||||
'$stateParams', 'Rest', 'Alert', 'CredentialList', 'generateList', 'Prompt',
|
'$stateParams', 'Rest', 'Alert', 'CredentialList', 'generateList', 'Prompt',
|
||||||
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
||||||
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'GetChoices', 'Wait',
|
'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,
|
$stateParams, CredentialForm, GenerateForm, Rest, Alert, ProcessErrors,
|
||||||
RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, Prompt,
|
RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, Prompt,
|
||||||
GetBasePath, GetChoices, KindChange, UserList, TeamList, LookUpInit, Empty,
|
GetBasePath, GetChoices, KindChange, UserList, TeamList, LookUpInit, Empty,
|
||||||
OwnerChange, FormSave, Stream, Wait, $state) {
|
OwnerChange, FormSave, Wait, $state) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -502,9 +497,6 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log,
|
|||||||
field: 'become_method',
|
field: 'become_method',
|
||||||
variable: 'become_options'
|
variable: 'become_options'
|
||||||
});
|
});
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
// Save changes to the parent
|
// Save changes to the parent
|
||||||
$scope.formSave = function () {
|
$scope.formSave = function () {
|
||||||
@@ -619,5 +611,5 @@ CredentialsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location',
|
|||||||
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit',
|
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit',
|
||||||
'ReturnToCaller', 'ClearScope', 'Prompt', 'GetBasePath', 'GetChoices',
|
'ReturnToCaller', 'ClearScope', 'Prompt', 'GetBasePath', 'GetChoices',
|
||||||
'KindChange', 'UserList', 'TeamList', 'LookUpInit', 'Empty', 'OwnerChange',
|
'KindChange', 'UserList', 'TeamList', 'LookUpInit', 'Empty', 'OwnerChange',
|
||||||
'FormSave', 'Stream', 'Wait', '$state'
|
'FormSave', 'Wait', '$state'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
export function Home($scope, $compile, $stateParams, $rootScope, $location, $log, Wait,
|
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');
|
ClearScope('home');
|
||||||
|
|
||||||
@@ -103,13 +103,6 @@ export function Home($scope, $compile, $stateParams, $rootScope, $location, $log
|
|||||||
$scope.$emit('dashboardDataLoadComplete');
|
$scope.$emit('dashboardDataLoadComplete');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({
|
|
||||||
scope: $scope
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.refresh = function () {
|
$scope.refresh = function () {
|
||||||
Wait('start');
|
Wait('start');
|
||||||
Rest.setUrl(GetBasePath('dashboard'));
|
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',
|
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,
|
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) {
|
Alert, Rest, Empty, InventoryUpdate, Find, GroupsCancelUpdate, Store) {
|
||||||
|
|
||||||
ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
|
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) {
|
scope.editGroup = function (group_id, inventory_id) {
|
||||||
PreviousSearchParams = Store('group_current_search_params');
|
PreviousSearchParams = Store('group_current_search_params');
|
||||||
GroupsEdit({
|
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',
|
HomeGroups.$inject = ['$rootScope', '$log', '$scope', '$filter', '$compile', '$location', '$stateParams', 'LogViewer', 'HomeGroupList', 'generateList', 'ProcessErrors', 'ReturnToCaller',
|
||||||
'ClearScope', 'GetBasePath', 'SearchInit', 'PaginateInit', 'FormatDate', 'GetHostsStatusMsg', 'GetSyncStatusMsg', 'ViewUpdateStatus',
|
'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,
|
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
|
ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
|
||||||
//scope.
|
//scope.
|
||||||
@@ -664,12 +651,6 @@ export function HomeHosts($scope, $location, $stateParams, HomeHostList, Generat
|
|||||||
ViewJob({ scope: $scope, id: id });
|
ViewJob({ scope: $scope, id: id });
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({
|
|
||||||
scope: $scope
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.toggleHostEnabled = function (id, sources) {
|
$scope.toggleHostEnabled = function (id, sources) {
|
||||||
ToggleHostEnabled({
|
ToggleHostEnabled({
|
||||||
host_id: id,
|
host_id: id,
|
||||||
@@ -705,6 +686,6 @@ export function HomeHosts($scope, $location, $stateParams, HomeHostList, Generat
|
|||||||
}
|
}
|
||||||
|
|
||||||
HomeHosts.$inject = ['$scope', '$location', '$stateParams', 'HomeHostList', 'generateList', 'ProcessErrors', 'ReturnToCaller',
|
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'
|
'Find', 'ShowJobSummary', 'ViewJob'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import '../job-templates/main';
|
|||||||
export function InventoriesList($scope, $rootScope, $location, $log,
|
export function InventoriesList($scope, $rootScope, $location, $log,
|
||||||
$stateParams, $compile, $filter, sanitizeFilter, Rest, Alert, InventoryList,
|
$stateParams, $compile, $filter, sanitizeFilter, Rest, Alert, InventoryList,
|
||||||
generateList, Prompt, SearchInit, PaginateInit, ReturnToCaller,
|
generateList, Prompt, SearchInit, PaginateInit, ReturnToCaller,
|
||||||
ClearScope, ProcessErrors, GetBasePath, Wait, Stream,
|
ClearScope, ProcessErrors, GetBasePath, Wait,
|
||||||
EditInventoryProperties, Find, Empty, LogViewer, $state) {
|
EditInventoryProperties, Find, Empty, LogViewer, $state) {
|
||||||
|
|
||||||
var list = InventoryList,
|
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) {
|
$scope.editInventoryProperties = function (inventory_id) {
|
||||||
EditInventoryProperties({ scope: $scope, inventory_id: 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',
|
InventoriesList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', '$compile', '$filter', 'sanitizeFilter', 'Rest', 'Alert', 'InventoryList', 'generateList',
|
||||||
'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors',
|
'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,
|
$log, $stateParams, InventoryForm, GenerateForm, Rest, Alert, ProcessErrors,
|
||||||
ReturnToCaller, ClearScope, generateList, OrganizationList, SearchInit,
|
ReturnToCaller, ClearScope, generateList, OrganizationList, SearchInit,
|
||||||
PaginateInit, LookUpInit, GetBasePath, ParseTypeChange, Wait, ToJSON,
|
PaginateInit, LookUpInit, GetBasePath, ParseTypeChange, Wait, ToJSON,
|
||||||
ParseVariableString, Stream, RelatedSearchInit, RelatedPaginateInit,
|
ParseVariableString, RelatedSearchInit, RelatedPaginateInit,
|
||||||
Prompt, PlaybookRun, CreateDialog, deleteJobTemplate, $state) {
|
Prompt, PlaybookRun, CreateDialog, deleteJobTemplate, $state) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
@@ -590,10 +586,6 @@ export function InventoriesEdit($scope, $rootScope, $compile, $location,
|
|||||||
$location.path($location.path() + '/manage');
|
$location.path($location.path() + '/manage');
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.formCancel = function () {
|
$scope.formCancel = function () {
|
||||||
$state.transitionTo('inventories');
|
$state.transitionTo('inventories');
|
||||||
};
|
};
|
||||||
@@ -776,7 +768,7 @@ InventoriesEdit.$inject = ['$scope', '$rootScope', '$compile', '$location',
|
|||||||
'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'generateList',
|
'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'generateList',
|
||||||
'OrganizationList', 'SearchInit', 'PaginateInit', 'LookUpInit',
|
'OrganizationList', 'SearchInit', 'PaginateInit', 'LookUpInit',
|
||||||
'GetBasePath', 'ParseTypeChange', 'Wait', 'ToJSON', 'ParseVariableString',
|
'GetBasePath', 'ParseTypeChange', 'Wait', 'ToJSON', 'ParseVariableString',
|
||||||
'Stream', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
|
'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
|
||||||
'PlaybookRun', 'CreateDialog', 'deleteJobTemplate', '$state'
|
'PlaybookRun', 'CreateDialog', 'deleteJobTemplate', '$state'
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -788,7 +780,7 @@ export function InventoriesManage ($log, $scope, $rootScope, $location,
|
|||||||
InjectHosts, Find, HostsReload, SearchInit, PaginateInit, GetSyncStatusMsg,
|
InjectHosts, Find, HostsReload, SearchInit, PaginateInit, GetSyncStatusMsg,
|
||||||
GetHostsStatusMsg, GroupsEdit, InventoryUpdate, GroupsCancelUpdate,
|
GetHostsStatusMsg, GroupsEdit, InventoryUpdate, GroupsCancelUpdate,
|
||||||
ViewUpdateStatus, GroupsDelete, Store, HostsEdit, HostsDelete,
|
ViewUpdateStatus, GroupsDelete, Store, HostsEdit, HostsDelete,
|
||||||
EditInventoryProperties, ToggleHostEnabled, Stream, ShowJobSummary,
|
EditInventoryProperties, ToggleHostEnabled, ShowJobSummary,
|
||||||
InventoryGroupsHelp, HelpDialog, ViewJob,
|
InventoryGroupsHelp, HelpDialog, ViewJob,
|
||||||
GroupsCopy, HostsCopy, $stateParams) {
|
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) {
|
hostScope.showJobSummary = function (job_id) {
|
||||||
ShowJobSummary({
|
ShowJobSummary({
|
||||||
job_id: job_id
|
job_id: job_id
|
||||||
@@ -1347,7 +1292,7 @@ InventoriesManage.$inject = ['$log', '$scope', '$rootScope', '$location',
|
|||||||
'SearchInit', 'PaginateInit', 'GetSyncStatusMsg', 'GetHostsStatusMsg',
|
'SearchInit', 'PaginateInit', 'GetSyncStatusMsg', 'GetHostsStatusMsg',
|
||||||
'GroupsEdit', 'InventoryUpdate', 'GroupsCancelUpdate', 'ViewUpdateStatus',
|
'GroupsEdit', 'InventoryUpdate', 'GroupsCancelUpdate', 'ViewUpdateStatus',
|
||||||
'GroupsDelete', 'Store', 'HostsEdit', 'HostsDelete',
|
'GroupsDelete', 'Store', 'HostsEdit', 'HostsDelete',
|
||||||
'EditInventoryProperties', 'ToggleHostEnabled', 'Stream', 'ShowJobSummary',
|
'EditInventoryProperties', 'ToggleHostEnabled', 'ShowJobSummary',
|
||||||
'InventoryGroupsHelp', 'HelpDialog', 'ViewJob', 'GroupsCopy',
|
'InventoryGroupsHelp', 'HelpDialog', 'ViewJob', 'GroupsCopy',
|
||||||
'HostsCopy', '$stateParams'
|
'HostsCopy', '$stateParams'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export function JobTemplatesList($scope, $rootScope, $location, $log,
|
|||||||
$stateParams, Rest, Alert, JobTemplateList, GenerateList, Prompt,
|
$stateParams, Rest, Alert, JobTemplateList, GenerateList, Prompt,
|
||||||
SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors,
|
SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors,
|
||||||
GetBasePath, JobTemplateForm, CredentialList, LookUpInit, PlaybookRun,
|
GetBasePath, JobTemplateForm, CredentialList, LookUpInit, PlaybookRun,
|
||||||
Wait, Stream, CreateDialog, $compile, $state) {
|
Wait, CreateDialog, $compile, $state) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -58,12 +58,6 @@ export function JobTemplatesList($scope, $rootScope, $location, $log,
|
|||||||
|
|
||||||
$scope.search(list.iterator);
|
$scope.search(list.iterator);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.addJobTemplate = function () {
|
$scope.addJobTemplate = function () {
|
||||||
$state.transitionTo('jobTemplates.add');
|
$state.transitionTo('jobTemplates.add');
|
||||||
};
|
};
|
||||||
@@ -246,7 +240,7 @@ JobTemplatesList.$inject = ['$scope', '$rootScope', '$location', '$log',
|
|||||||
'$stateParams', 'Rest', 'Alert', 'JobTemplateList', 'generateList',
|
'$stateParams', 'Rest', 'Alert', 'JobTemplateList', 'generateList',
|
||||||
'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
||||||
'ProcessErrors', 'GetBasePath', 'JobTemplateForm', 'CredentialList',
|
'ProcessErrors', 'GetBasePath', 'JobTemplateForm', 'CredentialList',
|
||||||
'LookUpInit', 'PlaybookRun', 'Wait', 'Stream', 'CreateDialog' , '$compile',
|
'LookUpInit', 'PlaybookRun', 'Wait', 'CreateDialog' , '$compile',
|
||||||
'$state'
|
'$state'
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -684,7 +678,7 @@ export function JobTemplatesEdit($filter, $scope, $rootScope, $compile,
|
|||||||
ProcessErrors, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller,
|
ProcessErrors, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller,
|
||||||
ClearScope, InventoryList, CredentialList, ProjectList, LookUpInit,
|
ClearScope, InventoryList, CredentialList, ProjectList, LookUpInit,
|
||||||
GetBasePath, md5Setup, ParseTypeChange, JobStatusToolTip, FormatDate, Wait,
|
GetBasePath, md5Setup, ParseTypeChange, JobStatusToolTip, FormatDate, Wait,
|
||||||
Stream, Empty, Prompt, ParseVariableString, ToJSON, SchedulesControllerInit,
|
Empty, Prompt, ParseVariableString, ToJSON, SchedulesControllerInit,
|
||||||
JobsControllerInit, JobsListUpdate, GetChoices, SchedulesListInit,
|
JobsControllerInit, JobsListUpdate, GetChoices, SchedulesListInit,
|
||||||
SchedulesList, CallbackHelpInit, PlaybookRun, SurveyControllerInit, $state){
|
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 () {
|
$scope.formCancel = function () {
|
||||||
$state.transitionTo('jobTemplates');
|
$state.transitionTo('jobTemplates');
|
||||||
};
|
};
|
||||||
@@ -1245,7 +1233,7 @@ JobTemplatesEdit.$inject = ['$filter', '$scope', '$rootScope', '$compile',
|
|||||||
'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit',
|
'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit',
|
||||||
'RelatedPaginateInit','ReturnToCaller', 'ClearScope', 'InventoryList',
|
'RelatedPaginateInit','ReturnToCaller', 'ClearScope', 'InventoryList',
|
||||||
'CredentialList', 'ProjectList', 'LookUpInit', 'GetBasePath', 'md5Setup',
|
'CredentialList', 'ProjectList', 'LookUpInit', 'GetBasePath', 'md5Setup',
|
||||||
'ParseTypeChange', 'JobStatusToolTip', 'FormatDate', 'Wait', 'Stream',
|
'ParseTypeChange', 'JobStatusToolTip', 'FormatDate', 'Wait',
|
||||||
'Empty', 'Prompt', 'ParseVariableString', 'ToJSON',
|
'Empty', 'Prompt', 'ParseVariableString', 'ToJSON',
|
||||||
'SchedulesControllerInit', 'JobsControllerInit', 'JobsListUpdate',
|
'SchedulesControllerInit', 'JobsControllerInit', 'JobsListUpdate',
|
||||||
'GetChoices', 'SchedulesListInit', 'SchedulesList', 'CallbackHelpInit',
|
'GetChoices', 'SchedulesListInit', 'SchedulesList', 'CallbackHelpInit',
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
export function OrganizationsList($stateParams, $scope, $rootScope, $location,
|
export function OrganizationsList($stateParams, $scope, $rootScope, $location,
|
||||||
$log, Rest, Alert, Prompt, ClearScope, ProcessErrors, GetBasePath, Wait,
|
$log, Rest, Alert, Prompt, ClearScope, ProcessErrors, GetBasePath, Wait,
|
||||||
Stream, $state) {
|
$state) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -111,10 +111,6 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location,
|
|||||||
$('#prompt-modal').modal('hide');
|
$('#prompt-modal').modal('hide');
|
||||||
});
|
});
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.addOrganization = function () {
|
$scope.addOrganization = function () {
|
||||||
$state.transitionTo('organizations.add');
|
$state.transitionTo('organizations.add');
|
||||||
};
|
};
|
||||||
@@ -156,7 +152,7 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location,
|
|||||||
OrganizationsList.$inject = ['$stateParams', '$scope', '$rootScope',
|
OrganizationsList.$inject = ['$stateParams', '$scope', '$rootScope',
|
||||||
'$location', '$log', 'Rest', 'Alert', 'Prompt', 'ClearScope',
|
'$location', '$log', 'Rest', 'Alert', 'Prompt', 'ClearScope',
|
||||||
'ProcessErrors', 'GetBasePath', 'Wait',
|
'ProcessErrors', 'GetBasePath', 'Wait',
|
||||||
'Stream', '$state'
|
'$state'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
@@ -217,7 +213,7 @@ OrganizationsAdd.$inject = ['$scope', '$rootScope', '$compile', '$location',
|
|||||||
export function OrganizationsEdit($scope, $rootScope, $compile, $location, $log,
|
export function OrganizationsEdit($scope, $rootScope, $compile, $location, $log,
|
||||||
$stateParams, OrganizationForm, GenerateForm, Rest, Alert, ProcessErrors,
|
$stateParams, OrganizationForm, GenerateForm, Rest, Alert, ProcessErrors,
|
||||||
RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath,
|
RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath,
|
||||||
Wait, Stream, $state) {
|
Wait, $state) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -306,12 +302,6 @@ export function OrganizationsEdit($scope, $rootScope, $compile, $location, $log,
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({
|
|
||||||
scope: $scope
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.formCancel = function () {
|
$scope.formCancel = function () {
|
||||||
$scope.$emit("ReloadOrganzationCards");
|
$scope.$emit("ReloadOrganzationCards");
|
||||||
$scope.$emit("ShowOrgListHeader");
|
$scope.$emit("ShowOrgListHeader");
|
||||||
@@ -363,5 +353,5 @@ export function OrganizationsEdit($scope, $rootScope, $compile, $location, $log,
|
|||||||
OrganizationsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location',
|
OrganizationsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location',
|
||||||
'$log', '$stateParams', 'OrganizationForm', 'GenerateForm', 'Rest', 'Alert',
|
'$log', '$stateParams', 'OrganizationForm', 'GenerateForm', 'Rest', 'Alert',
|
||||||
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
|
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
|
||||||
'ClearScope', 'GetBasePath', 'Wait', 'Stream', '$state'
|
'ClearScope', 'GetBasePath', 'Wait', '$state'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -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){
|
PortalJobsWidget, GenerateList, PortalJobTemplateList, SearchInit, PaginateInit, PlaybookRun){
|
||||||
|
|
||||||
ClearScope('portal');
|
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'
|
'PortalJobsWidget', 'generateList' , 'PortalJobTemplateList', 'SearchInit', 'PaginateInit', 'PlaybookRun'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
|
export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
|
||||||
Rest, Alert, ProjectList, GenerateList, Prompt, SearchInit,
|
Rest, Alert, ProjectList, GenerateList, Prompt, SearchInit,
|
||||||
PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
|
PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath,
|
||||||
SelectionInit, ProjectUpdate, Refresh, Wait, Stream, GetChoices, Empty,
|
SelectionInit, ProjectUpdate, Refresh, Wait, GetChoices, Empty,
|
||||||
Find, LogViewer, GetProjectIcon, GetProjectToolTip, $filter, $state) {
|
Find, LogViewer, GetProjectIcon, GetProjectToolTip, $filter, $state) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
@@ -192,10 +192,6 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
|
|||||||
callback: 'choicesReadyProjectList'
|
callback: 'choicesReadyProjectList'
|
||||||
});
|
});
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.addProject = function () {
|
$scope.addProject = function () {
|
||||||
$state.transitionTo('projects.add');
|
$state.transitionTo('projects.add');
|
||||||
};
|
};
|
||||||
@@ -377,7 +373,7 @@ ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log',
|
|||||||
'$stateParams', 'Rest', 'Alert', 'ProjectList', 'generateList', 'Prompt',
|
'$stateParams', 'Rest', 'Alert', 'ProjectList', 'generateList', 'Prompt',
|
||||||
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
||||||
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'ProjectUpdate',
|
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'ProjectUpdate',
|
||||||
'Refresh', 'Wait', 'Stream', 'GetChoices', 'Empty', 'Find',
|
'Refresh', 'Wait', 'GetChoices', 'Empty', 'Find',
|
||||||
'LogViewer', 'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state'
|
'LogViewer', 'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state'
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -535,7 +531,7 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
|
|||||||
$stateParams, ProjectsForm, GenerateForm, Rest, Alert, ProcessErrors,
|
$stateParams, ProjectsForm, GenerateForm, Rest, Alert, ProcessErrors,
|
||||||
RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath,
|
RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath,
|
||||||
ReturnToCaller, GetProjectPath, Authorization, CredentialList, LookUpInit,
|
ReturnToCaller, GetProjectPath, Authorization, CredentialList, LookUpInit,
|
||||||
GetChoices, Empty, DebugForm, Wait, Stream, SchedulesControllerInit,
|
GetChoices, Empty, DebugForm, Wait, SchedulesControllerInit,
|
||||||
SchedulesListInit, SchedulesList, ProjectUpdate, $state) {
|
SchedulesListInit, SchedulesList, ProjectUpdate, $state) {
|
||||||
|
|
||||||
ClearScope('htmlTemplate');
|
ClearScope('htmlTemplate');
|
||||||
@@ -761,10 +757,6 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
// Related set: Add button
|
// Related set: Add button
|
||||||
$scope.add = function (set) {
|
$scope.add = function (set) {
|
||||||
$rootScope.flashMessage = null;
|
$rootScope.flashMessage = null;
|
||||||
@@ -830,6 +822,6 @@ ProjectsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
|
|||||||
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
|
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt',
|
||||||
'ClearScope', 'GetBasePath', 'ReturnToCaller', 'GetProjectPath',
|
'ClearScope', 'GetBasePath', 'ReturnToCaller', 'GetProjectPath',
|
||||||
'Authorization', 'CredentialList', 'LookUpInit', 'GetChoices', 'Empty',
|
'Authorization', 'CredentialList', 'LookUpInit', 'GetChoices', 'Empty',
|
||||||
'DebugForm', 'Wait', 'Stream', 'SchedulesControllerInit',
|
'DebugForm', 'Wait', 'SchedulesControllerInit',
|
||||||
'SchedulesListInit', 'SchedulesList', 'ProjectUpdate', '$state'
|
'SchedulesListInit', 'SchedulesList', 'ProjectUpdate', '$state'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
|
|
||||||
export function ScheduleEditController($scope, $compile, $location, $stateParams, SchedulesList, Rest, ProcessErrors, ReturnToCaller, ClearScope,
|
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();
|
ClearScope();
|
||||||
|
|
||||||
@@ -70,10 +70,6 @@ GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices, Stre
|
|||||||
$scope.search(SchedulesList.iterator);
|
$scope.search(SchedulesList.iterator);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
Wait('start');
|
Wait('start');
|
||||||
|
|
||||||
GetChoices({
|
GetChoices({
|
||||||
@@ -86,4 +82,4 @@ GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices, Stre
|
|||||||
}
|
}
|
||||||
|
|
||||||
ScheduleEditController.$inject = [ '$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'ReturnToCaller', 'ClearScope',
|
ScheduleEditController.$inject = [ '$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'ReturnToCaller', 'ClearScope',
|
||||||
'GetBasePath', 'Wait', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices', 'Stream' ];
|
'GetBasePath', 'Wait', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices'];
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
export function TeamsList($scope, $rootScope, $location, $log, $stateParams,
|
export function TeamsList($scope, $rootScope, $location, $log, $stateParams,
|
||||||
Rest, Alert, TeamList, GenerateList, Prompt, SearchInit, PaginateInit,
|
Rest, Alert, TeamList, GenerateList, Prompt, SearchInit, PaginateInit,
|
||||||
ReturnToCaller, ClearScope, ProcessErrors, SetTeamListeners, GetBasePath,
|
ReturnToCaller, ClearScope, ProcessErrors, SetTeamListeners, GetBasePath,
|
||||||
SelectionInit, Wait, Stream, $state, Refresh) {
|
SelectionInit, Wait, $state, Refresh) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -79,10 +79,6 @@ export function TeamsList($scope, $rootScope, $location, $log, $stateParams,
|
|||||||
});
|
});
|
||||||
$scope.search(list.iterator);
|
$scope.search(list.iterator);
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.addTeam = function () {
|
$scope.addTeam = function () {
|
||||||
$state.transitionTo('teams.add');
|
$state.transitionTo('teams.add');
|
||||||
};
|
};
|
||||||
@@ -126,7 +122,7 @@ TeamsList.$inject = ['$scope', '$rootScope', '$location', '$log',
|
|||||||
'$stateParams', 'Rest', 'Alert', 'TeamList', 'generateList', 'Prompt',
|
'$stateParams', 'Rest', 'Alert', 'TeamList', 'generateList', 'Prompt',
|
||||||
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
||||||
'ProcessErrors', 'SetTeamListeners', 'GetBasePath', 'SelectionInit', 'Wait',
|
'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,
|
$stateParams, TeamForm, GenerateForm, Rest, Alert, ProcessErrors,
|
||||||
RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope,
|
RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope,
|
||||||
LookUpInit, Prompt, GetBasePath, CheckAccess, OrganizationList, Wait,
|
LookUpInit, Prompt, GetBasePath, CheckAccess, OrganizationList, Wait,
|
||||||
Stream, fieldChoices, fieldLabels, permissionsSearchSelect, $state) {
|
fieldChoices, fieldLabels, permissionsSearchSelect, $state) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -327,10 +323,6 @@ export function TeamsEdit($scope, $rootScope, $compile, $location, $log,
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
// Save changes to the parent
|
// Save changes to the parent
|
||||||
$scope.formSave = function () {
|
$scope.formSave = function () {
|
||||||
var data = {}, fld;
|
var data = {}, fld;
|
||||||
@@ -440,6 +432,6 @@ TeamsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
|
|||||||
'$stateParams', 'TeamForm', 'GenerateForm', 'Rest', 'Alert',
|
'$stateParams', 'TeamForm', 'GenerateForm', 'Rest', 'Alert',
|
||||||
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit',
|
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit',
|
||||||
'ReturnToCaller', 'ClearScope', 'LookUpInit', 'Prompt', 'GetBasePath',
|
'ReturnToCaller', 'ClearScope', 'LookUpInit', 'Prompt', 'GetBasePath',
|
||||||
'CheckAccess', 'OrganizationList', 'Wait', 'Stream', 'fieldChoices',
|
'CheckAccess', 'OrganizationList', 'Wait', 'fieldChoices',
|
||||||
'fieldLabels', 'permissionsSearchSelect', '$state'
|
'fieldLabels', 'permissionsSearchSelect', '$state'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
export function UsersList($scope, $rootScope, $location, $log, $stateParams,
|
export function UsersList($scope, $rootScope, $location, $log, $stateParams,
|
||||||
Rest, Alert, UserList, GenerateList, Prompt, SearchInit, PaginateInit,
|
Rest, Alert, UserList, GenerateList, Prompt, SearchInit, PaginateInit,
|
||||||
ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit,
|
ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit,
|
||||||
Wait, Stream, $state, Refresh) {
|
Wait, $state, Refresh) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -71,10 +71,6 @@ export function UsersList($scope, $rootScope, $location, $log, $stateParams,
|
|||||||
});
|
});
|
||||||
$scope.search(list.iterator);
|
$scope.search(list.iterator);
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.addUser = function () {
|
$scope.addUser = function () {
|
||||||
$state.transitionTo('users.add');
|
$state.transitionTo('users.add');
|
||||||
};
|
};
|
||||||
@@ -115,7 +111,7 @@ export function UsersList($scope, $rootScope, $location, $log, $stateParams,
|
|||||||
UsersList.$inject = ['$scope', '$rootScope', '$location', '$log',
|
UsersList.$inject = ['$scope', '$rootScope', '$location', '$log',
|
||||||
'$stateParams', 'Rest', 'Alert', 'UserList', 'generateList', 'Prompt',
|
'$stateParams', 'Rest', 'Alert', 'UserList', 'generateList', 'Prompt',
|
||||||
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
|
||||||
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', 'Stream', '$state',
|
'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', '$state',
|
||||||
'Refresh'
|
'Refresh'
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -226,7 +222,7 @@ UsersAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
|
|||||||
export function UsersEdit($scope, $rootScope, $compile, $location, $log,
|
export function UsersEdit($scope, $rootScope, $compile, $location, $log,
|
||||||
$stateParams, UserForm, GenerateForm, Rest, Alert, ProcessErrors,
|
$stateParams, UserForm, GenerateForm, Rest, Alert, ProcessErrors,
|
||||||
RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope,
|
RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope,
|
||||||
GetBasePath, Prompt, CheckAccess, ResetForm, Wait, Stream, fieldChoices,
|
GetBasePath, Prompt, CheckAccess, ResetForm, Wait, fieldChoices,
|
||||||
fieldLabels, permissionsSearchSelect, $state) {
|
fieldLabels, permissionsSearchSelect, $state) {
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
@@ -399,10 +395,6 @@ export function UsersEdit($scope, $rootScope, $compile, $location, $log,
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.formCancel = function () {
|
$scope.formCancel = function () {
|
||||||
$state.transitionTo('users');
|
$state.transitionTo('users');
|
||||||
};
|
};
|
||||||
@@ -551,6 +543,6 @@ UsersEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
|
|||||||
'$stateParams', 'UserForm', 'GenerateForm', 'Rest', 'Alert',
|
'$stateParams', 'UserForm', 'GenerateForm', 'Rest', 'Alert',
|
||||||
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit',
|
'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit',
|
||||||
'ReturnToCaller', 'ClearScope', 'GetBasePath', 'Prompt', 'CheckAccess',
|
'ReturnToCaller', 'ClearScope', 'GetBasePath', 'Prompt', 'CheckAccess',
|
||||||
'ResetForm', 'Wait', 'Stream', 'fieldChoices', 'fieldLabels',
|
'ResetForm', 'Wait', 'fieldChoices', 'fieldLabels',
|
||||||
'permissionsSearchSelect', '$state'
|
'permissionsSearchSelect', '$state'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -7,11 +7,11 @@
|
|||||||
export default
|
export default
|
||||||
[ '$rootScope','Wait', 'generateList', 'inventoryScriptsListObject',
|
[ '$rootScope','Wait', 'generateList', 'inventoryScriptsListObject',
|
||||||
'GetBasePath' , 'SearchInit' , 'PaginateInit',
|
'GetBasePath' , 'SearchInit' , 'PaginateInit',
|
||||||
'Rest' , 'ProcessErrors', 'Prompt', '$state', 'Stream',
|
'Rest' , 'ProcessErrors', 'Prompt', '$state',
|
||||||
function(
|
function(
|
||||||
$rootScope,Wait, GenerateList, inventoryScriptsListObject,
|
$rootScope,Wait, GenerateList, inventoryScriptsListObject,
|
||||||
GetBasePath, SearchInit, PaginateInit,
|
GetBasePath, SearchInit, PaginateInit,
|
||||||
Rest, ProcessErrors, Prompt, $state, Stream
|
Rest, ProcessErrors, Prompt, $state
|
||||||
) {
|
) {
|
||||||
var scope = $rootScope.$new(),
|
var scope = $rootScope.$new(),
|
||||||
defaultUrl = GetBasePath('inventory_scripts'),
|
defaultUrl = GetBasePath('inventory_scripts'),
|
||||||
@@ -49,10 +49,6 @@ export default
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
scope.showActivity = function () {
|
|
||||||
Stream({ scope: scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
scope.deleteCustomInv = function(id, name){
|
scope.deleteCustomInv = function(id, name){
|
||||||
|
|
||||||
var action = function () {
|
var action = function () {
|
||||||
|
|||||||
@@ -11,12 +11,12 @@ export default
|
|||||||
'GetBasePath' , 'SearchInit' , 'PaginateInit',
|
'GetBasePath' , 'SearchInit' , 'PaginateInit',
|
||||||
'SchedulesList',
|
'SchedulesList',
|
||||||
'Rest' , 'ProcessErrors', 'managementJobsListObject', '$rootScope',
|
'Rest' , 'ProcessErrors', 'managementJobsListObject', '$rootScope',
|
||||||
'$state', 'Stream',
|
'$state',
|
||||||
function( Wait, $location, $compile, CreateDialog, GenerateList,
|
function( Wait, $location, $compile, CreateDialog, GenerateList,
|
||||||
GetBasePath, SearchInit, PaginateInit,
|
GetBasePath, SearchInit, PaginateInit,
|
||||||
SchedulesList,
|
SchedulesList,
|
||||||
Rest, ProcessErrors, managementJobsListObject, $rootScope,
|
Rest, ProcessErrors, managementJobsListObject, $rootScope,
|
||||||
$state, Stream) {
|
$state) {
|
||||||
|
|
||||||
var scope = $rootScope.$new(),
|
var scope = $rootScope.$new(),
|
||||||
parent_scope = scope,
|
parent_scope = scope,
|
||||||
@@ -47,10 +47,6 @@ export default
|
|||||||
|
|
||||||
scope.search(list.iterator);
|
scope.search(list.iterator);
|
||||||
|
|
||||||
scope.showActivity = function () {
|
|
||||||
Stream({ scope: scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
// Cancel
|
// Cancel
|
||||||
scope.cancelConfigure = function () {
|
scope.cancelConfigure = function () {
|
||||||
try {
|
try {
|
||||||
@@ -252,7 +248,7 @@ export default
|
|||||||
|
|
||||||
scope.configureSchedule = function() {
|
scope.configureSchedule = function() {
|
||||||
$state.transitionTo('managementJobsSchedule', {
|
$state.transitionTo('managementJobsSchedule', {
|
||||||
management_job: this.configure_job,
|
management_job: this.configure_job,
|
||||||
management_job_id: this.configure_job.id
|
management_job_id: this.configure_job.id
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,10 +13,10 @@
|
|||||||
export default [
|
export default [
|
||||||
'$scope', '$location', '$stateParams', 'SchedulesList', 'Rest',
|
'$scope', '$location', '$stateParams', 'SchedulesList', 'Rest',
|
||||||
'ProcessErrors', 'GetBasePath', 'Wait','LoadSchedulesScope', 'GetChoices',
|
'ProcessErrors', 'GetBasePath', 'Wait','LoadSchedulesScope', 'GetChoices',
|
||||||
'Stream', 'management_job', '$rootScope',
|
'management_job', '$rootScope',
|
||||||
function($scope, $location, $stateParams, SchedulesList, Rest,
|
function($scope, $location, $stateParams, SchedulesList, Rest,
|
||||||
ProcessErrors, GetBasePath, Wait, LoadSchedulesScope, GetChoices,
|
ProcessErrors, GetBasePath, Wait, LoadSchedulesScope, GetChoices,
|
||||||
Stream, management_job, $rootScope) {
|
management_job, $rootScope) {
|
||||||
var base, id, url, parentObject;
|
var base, id, url, parentObject;
|
||||||
$scope.management_job = management_job;
|
$scope.management_job = management_job;
|
||||||
base = $location.path().replace(/^\//, '').split('/')[0];
|
base = $location.path().replace(/^\//, '').split('/')[0];
|
||||||
@@ -76,10 +76,6 @@ export default [
|
|||||||
$scope.search(SchedulesList.iterator);
|
$scope.search(SchedulesList.iterator);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
Wait('start');
|
Wait('start');
|
||||||
|
|
||||||
GetChoices({
|
GetChoices({
|
||||||
|
|||||||
@@ -13,11 +13,10 @@
|
|||||||
|
|
||||||
export default [
|
export default [
|
||||||
'$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'ReturnToCaller', 'ClearScope',
|
'$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,
|
function ($scope, $compile, $location, $stateParams,
|
||||||
SchedulesList, Rest, ProcessErrors, ReturnToCaller, ClearScope,
|
SchedulesList, Rest, ProcessErrors, ReturnToCaller, ClearScope,
|
||||||
GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices,
|
GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices) {
|
||||||
Stream) {
|
|
||||||
|
|
||||||
ClearScope();
|
ClearScope();
|
||||||
|
|
||||||
@@ -79,10 +78,6 @@ export default [
|
|||||||
$scope.search(SchedulesList.iterator);
|
$scope.search(SchedulesList.iterator);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showActivity = function () {
|
|
||||||
Stream({ scope: $scope });
|
|
||||||
};
|
|
||||||
|
|
||||||
Wait('start');
|
Wait('start');
|
||||||
|
|
||||||
GetChoices({
|
GetChoices({
|
||||||
|
|||||||
Reference in New Issue
Block a user