From 2e3844decbc535b31d616639a32677a19c6e4645 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 26 Jun 2015 12:34:05 -0400 Subject: [PATCH 01/11] changing select type from checkbox to radio button for the selection of Team in the credential add/edit form page --- awx/ui/client/src/controllers/Credentials.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/controllers/Credentials.js b/awx/ui/client/src/controllers/Credentials.js index 34233b9a98..73ae12258f 100644 --- a/awx/ui/client/src/controllers/Credentials.js +++ b/awx/ui/client/src/controllers/Credentials.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name controllers.function:Credentials @@ -176,6 +176,7 @@ export function CredentialsAdd($scope, $rootScope, $compile, $location, $log, $r current_item: (!Empty($routeParams.team_id)) ? $routeParams.team_id : null, list: TeamList, field: 'team', + input_type: 'radio', autopopulateLookup: false }); @@ -347,6 +348,7 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log, $ form: form, current_item: (!Empty($scope.team_id)) ? $scope.team_id : null, list: TeamList, + input_type: 'radio', field: 'team' }); From 6b4b959bc57f391a2b406e39df9aefdcb4ef4e46 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 29 Jun 2015 10:24:13 -0400 Subject: [PATCH 02/11] removing unneccessary tooltip on scheduler modal --- awx/ui/client/src/partials/schedule_dialog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/partials/schedule_dialog.html b/awx/ui/client/src/partials/schedule_dialog.html index d9feaf4e38..bdf72a5dd5 100644 --- a/awx/ui/client/src/partials/schedule_dialog.html +++ b/awx/ui/client/src/partials/schedule_dialog.html @@ -1,4 +1,4 @@ -
+
- +

View Your License

 diff --git a/awx/ui/client/src/setup-menu/setup.controller.js b/awx/ui/client/src/setup-menu/setup.controller.js index f55c4ddc91..75c28b0727 100644 --- a/awx/ui/client/src/setup-menu/setup.controller.js +++ b/awx/ui/client/src/setup-menu/setup.controller.js @@ -3,13 +3,11 @@ export default '$rootScope', 'AboutAnsibleHelp', 'ConfigureTower', - 'CreateCustomInventory', function( $scope, $rootScope, showAboutModal, - configureTower, - showInventoryScriptsModal + configureTower ) { $scope.showAboutModal = showAboutModal; @@ -19,9 +17,5 @@ export default parent_scope: $rootScope }); - $scope.showInventoryScriptsModal = showInventoryScriptsModal.bind(null, - { parent_scope: $rootScope - }); - } ]; diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index 97d55dc7b8..17b4129bd7 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -152,9 +152,9 @@ - + - +