From 28f693b7bdbbf44f06d86e9b7bb9f649ef412898 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Thu, 25 Feb 2016 09:43:20 -0500 Subject: [PATCH] #951 #999 add missing dependency injection to unit test, fix misc styles --- awx/ui/client/legacy-styles/forms.less | 3 ++- awx/ui/client/src/adhoc/adhoc.controller.js | 2 +- awx/ui/client/src/controllers/Inventories.js | 1 - awx/ui/client/tests/adhoc/adhoc.controller-test.js | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 5f1ae9f449..86f10ec1c2 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -363,8 +363,9 @@ input[type='radio']:checked:before { display: flex; justify-content: flex-end; } + .Form-button{ - margin-left: 4px; + margin-left: 4px; } .Form-buttonDefault { diff --git a/awx/ui/client/src/adhoc/adhoc.controller.js b/awx/ui/client/src/adhoc/adhoc.controller.js index 17ca17783a..cb9e0a648e 100644 --- a/awx/ui/client/src/adhoc/adhoc.controller.js +++ b/awx/ui/client/src/adhoc/adhoc.controller.js @@ -1,5 +1,5 @@ /************************************************* - * Copyright (c) 2015 Ansible, Inc. + * Copyright (c) 2016 Ansible, Inc. * * All Rights Reserved *************************************************/ diff --git a/awx/ui/client/src/controllers/Inventories.js b/awx/ui/client/src/controllers/Inventories.js index 9b2774bd98..916b812976 100644 --- a/awx/ui/client/src/controllers/Inventories.js +++ b/awx/ui/client/src/controllers/Inventories.js @@ -860,7 +860,6 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, } $rootScope.hostPatterns = host_patterns; $state.go('inventoryManage.adhoc'); - //$location.path('/inventories/' + $scope.inventory.id + '/adhoc'); }; $scope.refreshHostsOnGroupRefresh = false; diff --git a/awx/ui/client/tests/adhoc/adhoc.controller-test.js b/awx/ui/client/tests/adhoc/adhoc.controller-test.js index c60af03f44..26583b71dd 100644 --- a/awx/ui/client/tests/adhoc/adhoc.controller-test.js +++ b/awx/ui/client/tests/adhoc/adhoc.controller-test.js @@ -55,6 +55,7 @@ describe("adhoc.controller", function() { $provide.value('Wait', waitCallback); $provide.value('$stateExtender', stateExtenderCallback); $provide.value('$stateParams', angular.noop); + $provide.value('$state', angular.noop); }])); beforeEach("put $q in scope", window.inject(['$q', function($q) {