zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-21 23:41:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'inject-dependency-audit' of https://github.com/mabashian/ansible-tower into mabashian-inject-dependency-audit

Browse Source 
# Conflicts:
#	awx/ui/client/src/activity-stream/factories/show-detail.factory.js
#	awx/ui/client/src/activity-stream/factories/stream.factory.js
#	awx/ui/client/src/credentials/add/credentials-add.controller.js
#	awx/ui/client/src/credentials/edit/credentials-edit.controller.js
#	awx/ui/client/src/credentials/list/credentials-list.controller.js
#	awx/ui/client/src/inventories/edit/inventory-edit.controller.js
#	awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
#	awx/ui/client/src/organizations/edit/organizations-edit.controller.js
#	awx/ui/client/src/organizations/linkout/addUsers/addUsers.controller.js
#	awx/ui/client/src/organizations/linkout/addUsers/addUsers.directive.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-admins.controller.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-teams.controller.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-users.controller.js
#	awx/ui/client/src/teams/add/teams-add.controller.js
#	awx/ui/client/src/teams/list/teams-list.controller.js
#	awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
#	awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
#	awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
#	awx/ui/client/src/users/add/users-add.controller.js
#	awx/ui/client/src/users/edit/users-edit.controller.js
#	awx/ui/client/src/users/list/users-list.controller.js
This commit is contained in:
Michael Abashian
2017-03-22 11:24:03 -04:00
parent 722f09357d 1869ba6742
commit 1c73cbdf48
76 changed files with 330 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/src/credentials/add/credentials-add.controller.js
View File

@@ -4,13 +4,14 @@
* All Rights Reserved
*************************************************/
export default ['$scope', '$rootScope', '$stateParams', 'CredentialForm',
'GenerateForm', 'Rest', 'ProcessErrors', 'ClearScope', 'GetBasePath',
'GetChoices', 'Empty', 'KindChange', 'BecomeMethodChange',
export default ['$scope', '$rootScope',
'$log', '$stateParams', 'CredentialForm', 'GenerateForm', 'Rest',
'ProcessErrors', 'ClearScope', 'GetBasePath', 'GetChoices', 'Empty', 'KindChange', 'BecomeMethodChange',
'OwnerChange', 'CredentialFormSave', '$state', 'CreateSelect2', 'i18n',
function($scope, $rootScope, $stateParams, CredentialForm, GenerateForm,
Rest, ProcessErrors, ClearScope, GetBasePath, GetChoices, Empty, KindChange,
BecomeMethodChange, OwnerChange, CredentialFormSave, $state, CreateSelect2, i18n) {
function($scope, $rootScope, $log,
$stateParams, CredentialForm, GenerateForm, Rest, ProcessErrors,
ClearScope, GetBasePath, GetChoices, Empty, KindChange, BecomeMethodChange,
OwnerChange, CredentialFormSave, $state, CreateSelect2, i18n) {
ClearScope();

18
awx/ui/client/src/credentials/edit/credentials-edit.controller.js
View File

@@ -4,15 +4,15 @@
* All Rights Reserved
*************************************************/
export default ['$scope', '$rootScope', '$location', '$stateParams',
'CredentialForm', 'Rest', 'ProcessErrors', 'ClearScope', 'Prompt',
'GetBasePath', 'GetChoices', 'KindChange', 'BecomeMethodChange', 'Empty',
'OwnerChange', 'Wait', '$state', 'CreateSelect2',
'Authorization', 'i18n', 'CredentialFormSave',
function($scope, $rootScope, $location, $stateParams, CredentialForm, Rest,
ProcessErrors, ClearScope, Prompt, GetBasePath, GetChoices, KindChange,
BecomeMethodChange, Empty, OwnerChange, Wait, $state,
CreateSelect2, Authorization, i18n, CredentialFormSave) {
export default ['$scope', '$rootScope', '$location',
'$stateParams', 'CredentialForm', 'Rest',
'ProcessErrors', 'ClearScope', 'Prompt', 'GetBasePath', 'GetChoices',
'KindChange', 'BecomeMethodChange', 'Empty', 'OwnerChange',
'CredentialFormSave', 'Wait', '$state', 'CreateSelect2', 'Authorization', 'i18n',
function($scope, $rootScope, $location,
$stateParams, CredentialForm, Rest, ProcessErrors, ClearScope, Prompt,
GetBasePath, GetChoices, KindChange, BecomeMethodChange, Empty, OwnerChange, CredentialFormSave, Wait,
$state, CreateSelect2, Authorization, i18n) {
ClearScope();

6
awx/ui/client/src/credentials/factories/credential-form-save.factory.js
View File

@@ -1,5 +1,5 @@
export default
function CredentialFormSave($rootScope, $location, Alert, Rest, ProcessErrors, Empty, GetBasePath, CredentialForm, ReturnToCaller, Wait, $state, i18n) {
function CredentialFormSave($rootScope, $location, Rest, ProcessErrors, GetBasePath, CredentialForm, ReturnToCaller, Wait, $state, i18n) {
return function(params) {
var scope = params.scope,
mode = params.mode,
@@ -99,7 +99,7 @@ export default
}
CredentialFormSave.$inject =
[ '$rootScope', '$location', 'Alert', 'Rest',
'ProcessErrors', 'Empty', 'GetBasePath', 'CredentialForm',
[ '$rootScope', '$location', 'Rest',
'ProcessErrors', 'GetBasePath', 'CredentialForm',
'ReturnToCaller', 'Wait', '$state', 'i18n'
];

7
awx/ui/client/src/credentials/list/credentials-list.controller.js
View File

@@ -5,10 +5,9 @@
*************************************************/
export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ClearScope',
'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter',
'rbacUiControlService', 'Dataset', 'i18n',
function($scope, Rest, CredentialList, Prompt, ClearScope, ProcessErrors,
GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset,
'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset', 'i18n',
function($scope, Rest, CredentialList, Prompt, ClearScope,
ProcessErrors, GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset,
i18n) {
ClearScope();