zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-26 01:41:48 -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

10
awx/ui/client/src/shared/form-generator.js
View File

@@ -139,13 +139,13 @@ import listGenerator from './list-generator/main';
export default
angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerator.name])
.factory('GenerateForm', ['$rootScope', '$location', '$compile', 'generateList',
.factory('GenerateForm', ['$rootScope', '$compile', 'generateList',
'Attr', 'Icon', 'Column',
'NavigationLink', 'HelpCollapse', 'DropDown', 'Empty', 'SelectIcon',
'Store', 'ActionButton', '$log', 'i18n',
function ($rootScope, $location, $compile, GenerateList,
'NavigationLink', 'HelpCollapse', 'Empty', 'SelectIcon',
'ActionButton', '$log', 'i18n',
function ($rootScope, $compile, GenerateList,
Attr, Icon, Column, NavigationLink, HelpCollapse,
DropDown, Empty, SelectIcon, Store, ActionButton, $log, i18n) {
Empty, SelectIcon, ActionButton, $log, i18n) {
return {
setForm: function (form) { this.form = form; },