From c89633c9b0b105c89f5fcd33e5672cf4f839b46f Mon Sep 17 00:00:00 2001 From: Rob Cresswell Date: Wed, 23 Nov 2016 12:34:39 +0000 Subject: [PATCH] Update for ui bootstrap changes UI Bootstrap decided to prefix all of their services/functions, so we need to add these prefixes for the code to continue to function. This patch primarily addresses functionality - some styling is broken even with this patch, but those breakages can be fixed once this patch lands. Change-Id: Ia6f593e27f81b2b00b6376426cc469a776c4add7 Depends-On: I7d8ebd4e9018332c1974672a0b99080c152ce6c3 --- .../util/actions/action-result.service.js | 2 +- .../widgets/form/modal-form.controller.js | 8 ++--- .../form/modal-form.controller.spec.js | 2 +- .../widgets/form/modal-form.service.js | 6 ++-- .../widgets/form/modal-form.service.spec.js | 10 +++--- .../modal-wait-spinner.service.js | 6 ++-- .../modal-wait-spinner.spec.js | 14 ++++---- .../widgets/modal/simple-modal.controller.js | 8 ++--- .../widgets/modal/simple-modal.service.js | 8 ++--- .../widgets/modal/simple-modal.spec.js | 4 +-- .../widgets/modal/wizard-modal.service.js | 6 ++-- .../modal/wizard-modal.service.spec.js | 2 +- .../widgets/modal/wizard.controller.js | 8 ++--- .../widgets/modal/wizard.controller.spec.js | 4 +-- .../wizard/modal-container.controller.js | 8 ++--- .../framework/widgets/wizard/wizard.spec.js | 2 +- horizon/static/horizon/js/horizon.tables.js | 6 ++-- .../theme-preview/theme-preview.directive.js | 6 ++-- .../project/containers/containers.html | 12 +++---- .../containers/delete-objects-modal.html | 4 +-- .../containers/delete-objects.controller.js | 8 ++--- .../delete-objects.controller.spec.js | 16 ++++----- .../objects-batch-actions.service.js | 22 ++++++------ .../objects-batch-actions.service.spec.js | 36 +++++++++---------- .../containers/objects-row-actions.service.js | 18 +++++----- .../objects-row-actions.service.spec.js | 26 +++++++------- .../keypair/create-keypair.controller.js | 10 +++--- .../keypair/create-keypair.controller.spec.js | 2 +- .../keypair/import-keypair.controller.js | 11 +++--- .../keypair/import-keypair.controller.spec.js | 2 +- .../keypair/keypair.controller.js | 10 +++--- .../keypair/keypair.controller.spec.js | 22 ++++++------ .../launch-instance-modal.service.js | 6 ++-- .../launch-instance-modal.service.spec.js | 4 +-- .../launch-instance/source/source.html | 6 ++-- .../steps/create-image/create-image.html | 10 +++--- .../images/steps/edit-image/edit-image.html | 4 +-- .../core/metadata/modal/modal.controller.js | 10 +++--- .../metadata/modal/modal.controller.spec.js | 2 +- .../app/core/metadata/modal/modal.service.js | 6 ++-- .../core/metadata/modal/modal.service.spec.js | 12 +++---- 41 files changed, 185 insertions(+), 184 deletions(-) diff --git a/horizon/static/framework/util/actions/action-result.service.js b/horizon/static/framework/util/actions/action-result.service.js index eb89e15697..9184c406e6 100644 --- a/horizon/static/framework/util/actions/action-result.service.js +++ b/horizon/static/framework/util/actions/action-result.service.js @@ -61,7 +61,7 @@ * perform()'s final promise: * ``` * function performUpdate(item) { - * $modal.open(updateDialog).result.then(function result() { + * $uibModal.open(updateDialog).result.then(function result() { * return actionResult.updated('OS::Glance::Image', item.id).result; * }); * } diff --git a/horizon/static/framework/widgets/form/modal-form.controller.js b/horizon/static/framework/widgets/form/modal-form.controller.js index 14c8aff38e..04a5884db2 100644 --- a/horizon/static/framework/widgets/form/modal-form.controller.js +++ b/horizon/static/framework/widgets/form/modal-form.controller.js @@ -36,11 +36,11 @@ .controller('horizon.framework.widgets.form.ModalFormController', controller); controller.$inject = [ - '$modalInstance', + '$uibModalInstance', 'context' ]; - function controller($modalInstance, context) { + function controller($uibModalInstance, context) { var ctrl = this; ctrl.formTitle = context.title; ctrl.form = context.form; @@ -52,11 +52,11 @@ ctrl.cancel = cancel; function submit() { - return $modalInstance.close(context); + return $uibModalInstance.close(context); } function cancel() { - return $modalInstance.dismiss(context); + return $uibModalInstance.dismiss(context); } return ctrl; diff --git a/horizon/static/framework/widgets/form/modal-form.controller.spec.js b/horizon/static/framework/widgets/form/modal-form.controller.spec.js index 09884e0fce..ff5afde17f 100644 --- a/horizon/static/framework/widgets/form/modal-form.controller.spec.js +++ b/horizon/static/framework/widgets/form/modal-form.controller.spec.js @@ -35,7 +35,7 @@ ctrl = $controller( 'horizon.framework.widgets.form.ModalFormController', { - $modalInstance: modalInstance, + $uibModalInstance: modalInstance, context: context }); })); diff --git a/horizon/static/framework/widgets/form/modal-form.service.js b/horizon/static/framework/widgets/form/modal-form.service.js index 71e88f3864..2e2d245081 100644 --- a/horizon/static/framework/widgets/form/modal-form.service.js +++ b/horizon/static/framework/widgets/form/modal-form.service.js @@ -23,7 +23,7 @@ .factory('horizon.framework.widgets.form.ModalFormService', service); service.$inject = [ - '$modal', + '$uibModal', 'horizon.framework.widgets.basePath' ]; @@ -35,7 +35,7 @@ * Loads a Schema-Form (see modal-form.html) in a modal and returns the modal result promise. */ function service( - $modal, + $uibModal, widgetsBasePath ) { @@ -66,7 +66,7 @@ templateUrl: widgetsBasePath + 'form/modal-form.html' }; - return $modal.open(modalConfig).result; + return $uibModal.open(modalConfig).result; } } })(); diff --git a/horizon/static/framework/widgets/form/modal-form.service.spec.js b/horizon/static/framework/widgets/form/modal-form.service.spec.js index f001c411b8..04d65ced46 100644 --- a/horizon/static/framework/widgets/form/modal-form.service.spec.js +++ b/horizon/static/framework/widgets/form/modal-form.service.spec.js @@ -17,20 +17,20 @@ 'use strict'; describe('modal-form service', function () { - var service, $modal; + var service, $uibModal; beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.framework.widgets.form')); - beforeEach(inject(function ($injector, _$modal_) { - $modal = _$modal_; + beforeEach(inject(function ($injector, _$uibModal_) { + $uibModal = _$uibModal_; service = $injector.get( 'horizon.framework.widgets.form.ModalFormService' ); })); it('sets open parameters to modal resolve.context', function() { - spyOn($modal, 'open').and.callFake(function(config) { + spyOn($uibModal, 'open').and.callFake(function(config) { return { result: config }; @@ -54,7 +54,7 @@ }); it('sets default values for optional parameters', function() { - spyOn($modal, 'open').and.callFake(function(config) { + spyOn($uibModal, 'open').and.callFake(function(config) { return { result: config }; diff --git a/horizon/static/framework/widgets/modal-wait-spinner/modal-wait-spinner.service.js b/horizon/static/framework/widgets/modal-wait-spinner/modal-wait-spinner.service.js index 00c0b10195..83bd358458 100644 --- a/horizon/static/framework/widgets/modal-wait-spinner/modal-wait-spinner.service.js +++ b/horizon/static/framework/widgets/modal-wait-spinner/modal-wait-spinner.service.js @@ -19,7 +19,7 @@ .module('horizon.framework.widgets.modal-wait-spinner') .factory('horizon.framework.widgets.modal-wait-spinner.service', WaitSpinnerService); - WaitSpinnerService.$inject = ['$modal']; + WaitSpinnerService.$inject = ['$uibModal']; /* * @ngdoc factory @@ -32,7 +32,7 @@ * Over time, uses of the existing Horizon spinner ( horizon.modals.modal_spinner() ) * can be phased out, or refactored to use this component. */ - function WaitSpinnerService ($modal) { + function WaitSpinnerService ($uibModal) { var spinner = this; var service = { showModalSpinner: showModalSpinner, @@ -54,7 +54,7 @@ template: '
', windowClass: 'modal-wait-spinner modal_wrapper loading' }; - spinner.modalInstance = $modal.open(modalOptions); + spinner.modalInstance = $uibModal.open(modalOptions); } function hideModalSpinner() { diff --git a/horizon/static/framework/widgets/modal-wait-spinner/modal-wait-spinner.spec.js b/horizon/static/framework/widgets/modal-wait-spinner/modal-wait-spinner.spec.js index 3401343a79..aaa432d344 100644 --- a/horizon/static/framework/widgets/modal-wait-spinner/modal-wait-spinner.spec.js +++ b/horizon/static/framework/widgets/modal-wait-spinner/modal-wait-spinner.spec.js @@ -36,16 +36,16 @@ expect(service.showModalSpinner).toBeDefined(); }); - it('opens modal with the correct object', inject(function($modal) { + it('opens modal with the correct object', inject(function($uibModal) { var wanted = { backdrop: 'static', template: '
', windowClass: 'modal-wait-spinner modal_wrapper loading' }; - spyOn($modal, 'open'); + spyOn($uibModal, 'open'); service.showModalSpinner('my text'); - expect($modal.open).toHaveBeenCalled(); - expect($modal.open.calls.count()).toBe(1); - expect($modal.open.calls.argsFor(0)).toEqual([wanted]); + expect($uibModal.open).toHaveBeenCalled(); + expect($uibModal.open.calls.count()).toBe(1); + expect($uibModal.open.calls.argsFor(0)).toEqual([wanted]); })); }); @@ -56,9 +56,9 @@ expect(service.hideModalSpinner).toBeDefined(); }); - it("dismisses modal when it has been opened", inject(function($modal) { + it("dismisses modal when it has been opened", inject(function($uibModal) { var modal = {dismiss: function() {}}; - spyOn($modal, 'open').and.returnValue(modal); + spyOn($uibModal, 'open').and.returnValue(modal); service.showModalSpinner('asdf'); spyOn(modal, 'dismiss'); service.hideModalSpinner(); diff --git a/horizon/static/framework/widgets/modal/simple-modal.controller.js b/horizon/static/framework/widgets/modal/simple-modal.controller.js index 3e6639be99..e311b073b7 100644 --- a/horizon/static/framework/widgets/modal/simple-modal.controller.js +++ b/horizon/static/framework/widgets/modal/simple-modal.controller.js @@ -37,18 +37,18 @@ .controller('SimpleModalController', SimpleModalController); SimpleModalController.$inject = [ - '$modalInstance', + '$uibModalInstance', 'context' ]; - function SimpleModalController($modalInstance, context) { + function SimpleModalController($uibModalInstance, context) { var ctrl = this; ctrl.context = context; ctrl.submit = function() { - $modalInstance.close(); + $uibModalInstance.close(); }; ctrl.cancel = function() { - $modalInstance.dismiss('cancel'); + $uibModalInstance.dismiss('cancel'); }; } // end of function diff --git a/horizon/static/framework/widgets/modal/simple-modal.service.js b/horizon/static/framework/widgets/modal/simple-modal.service.js index 67c9df2f7f..c158f017fb 100644 --- a/horizon/static/framework/widgets/modal/simple-modal.service.js +++ b/horizon/static/framework/widgets/modal/simple-modal.service.js @@ -25,7 +25,7 @@ * Horizon's wrapper for angular-bootstrap modal service. * It should only be use for small confirmation dialogs. * @param {object} the object containing title, body, submit, and cancel labels - * @param {object} the object returned from angular-bootstrap $modal + * @param {object} the object returned from angular-bootstrap $uibModal * * @example: * angular @@ -55,12 +55,12 @@ .factory('horizon.framework.widgets.modal.simple-modal.service', modalService); modalService.$inject = [ - '$modal', + '$uibModal', 'horizon.framework.widgets.basePath', 'horizon.framework.util.i18n.gettext' ]; - function modalService($modal, path, gettext) { + function modalService($uibModal, path, gettext) { var service = { modal: modal }; @@ -84,7 +84,7 @@ } } }; - return $modal.open(options); + return $uibModal.open(options); } } // end of modalOptions function } // end of modalService function diff --git a/horizon/static/framework/widgets/modal/simple-modal.spec.js b/horizon/static/framework/widgets/modal/simple-modal.spec.js index 59f0579e59..2f6e8c61cd 100644 --- a/horizon/static/framework/widgets/modal/simple-modal.spec.js +++ b/horizon/static/framework/widgets/modal/simple-modal.spec.js @@ -32,7 +32,7 @@ }; context = { what: 'is it' }; ctrl = $controller('SimpleModalController', - {$modalInstance: modalInstance, + {$uibModalInstance: modalInstance, context: context}); })); @@ -73,7 +73,7 @@ modal = { open: function() { return 'val'; }}; - $provide.value('$modal', modal); + $provide.value('$uibModal', modal); })); beforeEach(inject(function($injector) { diff --git a/horizon/static/framework/widgets/modal/wizard-modal.service.js b/horizon/static/framework/widgets/modal/wizard-modal.service.js index 56c8372ee7..35ac8c9344 100644 --- a/horizon/static/framework/widgets/modal/wizard-modal.service.js +++ b/horizon/static/framework/widgets/modal/wizard-modal.service.js @@ -48,10 +48,10 @@ WizardModalService.$inject = [ '$log', - '$modal' + '$uibModal' ]; - function WizardModalService($log, $modal) { + function WizardModalService($log, $uibModal) { var service = { modal: modal }; @@ -88,7 +88,7 @@ options.scope = params.scope; } - return $modal.open(options); + return $uibModal.open(options); } } } diff --git a/horizon/static/framework/widgets/modal/wizard-modal.service.spec.js b/horizon/static/framework/widgets/modal/wizard-modal.service.spec.js index 07ed69540d..920fe7e8e5 100644 --- a/horizon/static/framework/widgets/modal/wizard-modal.service.spec.js +++ b/horizon/static/framework/widgets/modal/wizard-modal.service.spec.js @@ -23,7 +23,7 @@ modal = { open: function() {} }; - $provide.value('$modal', modal); + $provide.value('$uibModal', modal); })); beforeEach(inject(function($injector, _$rootScope_) { diff --git a/horizon/static/framework/widgets/modal/wizard.controller.js b/horizon/static/framework/widgets/modal/wizard.controller.js index bf38d76e13..aeea96e4f3 100644 --- a/horizon/static/framework/widgets/modal/wizard.controller.js +++ b/horizon/static/framework/widgets/modal/wizard.controller.js @@ -22,7 +22,7 @@ .controller('WizardModalController', WizardModalController); WizardModalController.$inject = [ - '$modalInstance', + '$uibModalInstance', '$scope', 'workflow', // WizardModalService injected 'submit', // WizardModalService injected @@ -39,7 +39,7 @@ * This controller sets the modal actions and workflow on the given scope * as the Wizard needs them defined on the scope. */ - function WizardModalController($modalInstance, $scope, workflow, submit, data) { + function WizardModalController($uibModalInstance, $scope, workflow, submit, data) { /* eslint-disable angular/controller-as */ $scope.close = close; @@ -54,11 +54,11 @@ /* eslint-enable angular/controller-as */ function close(args) { - $modalInstance.close(args); + $uibModalInstance.close(args); } function cancel() { - $modalInstance.dismiss('cancel'); + $uibModalInstance.dismiss('cancel'); } } diff --git a/horizon/static/framework/widgets/modal/wizard.controller.spec.js b/horizon/static/framework/widgets/modal/wizard.controller.spec.js index 2ad0fa7a1e..04d6ccd885 100644 --- a/horizon/static/framework/widgets/modal/wizard.controller.spec.js +++ b/horizon/static/framework/widgets/modal/wizard.controller.spec.js @@ -21,7 +21,7 @@ describe(wizardCtrl, function() { var modalCalls = [ 'close', 'dismiss' ]; - var modalInstance = jasmine.createSpyObj('$modalInstance', modalCalls); + var modalInstance = jasmine.createSpyObj('$uibModalInstance', modalCalls); var scope; @@ -31,7 +31,7 @@ beforeEach(inject(function($controller, $rootScope) { scope = $rootScope.$new(); $controller(wizardCtrl, { - $modalInstance: modalInstance, + $uibModalInstance: modalInstance, $scope: scope, workflow: { steps: 'somestep' }, submit: { api: 'someapi' }, diff --git a/horizon/static/framework/widgets/wizard/modal-container.controller.js b/horizon/static/framework/widgets/wizard/modal-container.controller.js index 174fc1901a..00b6b3d095 100644 --- a/horizon/static/framework/widgets/wizard/modal-container.controller.js +++ b/horizon/static/framework/widgets/wizard/modal-container.controller.js @@ -21,7 +21,7 @@ .module('horizon.framework.widgets.wizard') .controller('ModalContainerController', ModalContainerController); - ModalContainerController.$inject = ['$scope', '$modalInstance', 'launchContext']; + ModalContainerController.$inject = ['$scope', '$uibModalInstance', 'launchContext']; /** * @ngdoc controller @@ -29,16 +29,16 @@ * @description * Extends the bootstrap-ui modal widget */ - function ModalContainerController($scope, $modalInstance, launchContext) { + function ModalContainerController($scope, $uibModalInstance, launchContext) { // $scope is used because the methods are shared between // wizard and modal-container controller /*eslint-disable angular/controller-as */ $scope.launchContext = launchContext; $scope.close = function(args) { - $modalInstance.close(args); + $uibModalInstance.close(args); }; $scope.cancel = function() { - $modalInstance.dismiss(); + $uibModalInstance.dismiss(); }; /*eslint-enable angular/controller-as */ } diff --git a/horizon/static/framework/widgets/wizard/wizard.spec.js b/horizon/static/framework/widgets/wizard/wizard.spec.js index 7320ff5276..b329df4450 100644 --- a/horizon/static/framework/widgets/wizard/wizard.spec.js +++ b/horizon/static/framework/widgets/wizard/wizard.spec.js @@ -250,7 +250,7 @@ modalInstance = { close: angular.noop, dismiss: angular.noop }; launchContext = { my: 'data' }; ctrl = $controller('ModalContainerController', - { $scope: scope, $modalInstance: modalInstance, + { $scope: scope, $uibModalInstance: modalInstance, launchContext: launchContext }); })); diff --git a/horizon/static/horizon/js/horizon.tables.js b/horizon/static/horizon/js/horizon.tables.js index 3623c68058..611acb37e1 100644 --- a/horizon/static/horizon/js/horizon.tables.js +++ b/horizon/static/horizon/js/horizon.tables.js @@ -246,7 +246,7 @@ horizon.datatables.confirm = function(action) { return; } - var $modal_parent = $action.closest('.modal'); + var $uibModal_parent = $action.closest('.modal'); var name_array = []; var action_string = $action.text(); var help_text = $action.attr("help_text") || ""; @@ -300,10 +300,10 @@ horizon.datatables.confirm = function(action) { var modal = horizon.modals.create(title, body, action_string); modal.modal(); - if ($modal_parent.length) { + if ($uibModal_parent.length) { var child_backdrop = modal.next('.modal-backdrop'); // re-arrange z-index for these stacking modal - child_backdrop.css('z-index', $modal_parent.css('z-index')+10); + child_backdrop.css('z-index', $uibModal_parent.css('z-index')+10); modal.css('z-index', child_backdrop.css('z-index')+10); } diff --git a/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.directive.js b/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.directive.js index 74550b9978..a46531c102 100644 --- a/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.directive.js +++ b/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.directive.js @@ -47,8 +47,8 @@ e.preventDefault(); }); - var $modal = $('#source-modal'); - var $pre = $modal.find('pre'); + var $uibModal = $('#source-modal'); + var $pre = $uibModal.find('pre'); var $button = $('
') .click(function(){ @@ -65,7 +65,7 @@ $fragment = stripChart($fragment); var html = cleanSource($fragment.html()); $pre.text(unescapeHtml(html)); - $modal.modal(); + $uibModal.modal(); }); var $component = $('.bs-component'); diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/containers.html b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/containers.html index 90764a6806..d146dae938 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/containers.html +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/containers.html @@ -11,11 +11,11 @@
- - +
- +
- +
@@ -62,8 +62,8 @@ - - +
+
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects-modal.html b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects-modal.html index d62dacce05..5c217ba282 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects-modal.html +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects-modal.html @@ -22,9 +22,9 @@ class="text-danger" translate> Encountered {$ ctrl.model.deleted.failures $} failures.

- + value="ctrl.model.deleted.files + ctrl.model.deleted.folders + ctrl.model.deleted.failures">
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects.controller.js index dfd976893f..f203c61bc3 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects.controller.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects.controller.js @@ -23,10 +23,10 @@ DeleteObjectsModalController.$inject = [ 'horizon.dashboard.project.containers.containers-model', - 'selected', '$modalInstance' + 'selected', '$uibModalInstance' ]; - function DeleteObjectsModalController(model, selected, $modalInstance) { + function DeleteObjectsModalController(model, selected, $uibModalInstance) { var ctrl = this; ctrl.model = { @@ -47,7 +47,7 @@ ctrl.dismiss = function dismiss() { ctrl.model.cancel = true; - $modalInstance.dismiss(); + $uibModalInstance.dismiss(); }; ctrl.action = function action() { @@ -57,7 +57,7 @@ return model.recursiveDelete(ctrl.model, {tree: ctrl.model.collection}) .then(function done() { ctrl.model.running = false; }); } else { - $modalInstance.close(); + $uibModalInstance.close(); } }; } diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects.controller.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects.controller.spec.js index 3816b68f03..60b264bb28 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects.controller.spec.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects.controller.spec.js @@ -23,14 +23,14 @@ beforeEach(module('horizon.dashboard.project')); var $q, $rootScope, collectDeferred, controller, model; - var $modalInstance = { + var $uibModalInstance = { dismiss: angular.noop, close: angular.noop }; beforeEach(module('horizon.dashboard.project.containers')); - beforeEach(inject(function ($injector, _$q_, _$modal_, _$rootScope_) { + beforeEach(inject(function ($injector, _$q_, _$rootScope_) { controller = $injector.get('$controller'); $q = _$q_; $rootScope = _$rootScope_; @@ -41,7 +41,7 @@ function createController(selected) { return controller('DeleteObjectsModalController', { - $modalInstance: $modalInstance, + $uibModalInstance: $uibModalInstance, selected: selected }); } @@ -67,30 +67,30 @@ }); it('should cancel collection on dismiss', function() { - spyOn($modalInstance, 'dismiss'); + spyOn($uibModalInstance, 'dismiss'); var ctrl = createController([]); expect(ctrl.model.cancel).toEqual(false); ctrl.dismiss(); expect(ctrl.model.cancel).toEqual(true); - expect($modalInstance.dismiss).toHaveBeenCalled(); + expect($uibModalInstance.dismiss).toHaveBeenCalled(); }); it('should close perform delete on OK after collection', function() { - spyOn($modalInstance, 'close'); + spyOn($uibModalInstance, 'close'); var ctrl = createController([]); ctrl.model.mode = 'deletion'; ctrl.action(); - expect($modalInstance.close).toHaveBeenCalled(); + expect($uibModalInstance.close).toHaveBeenCalled(); }); it('should close dialog on OK after delete', function() { var deferred = $q.defer(); spyOn(model, 'recursiveDelete').and.returnValue(deferred.promise); - spyOn($modalInstance, 'close'); + spyOn($uibModalInstance, 'close'); var ctrl = createController([]); ctrl.model.mode = 'discovery'; diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-batch-actions.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-batch-actions.service.js index b7ba198a4b..748e0f7310 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-batch-actions.service.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-batch-actions.service.js @@ -59,13 +59,13 @@ }); } - function uploadModal(html, $modal) { + function uploadModal(html, $uibModal) { var localSpec = { backdrop: 'static', controller: 'horizon.dashboard.project.containers.UploadObjectModalController as ctrl', templateUrl: html }; - return $modal.open(localSpec).result; + return $uibModal.open(localSpec).result; } uploadService.$inject = [ @@ -75,17 +75,17 @@ 'horizon.framework.util.q.extensions', 'horizon.framework.widgets.modal-wait-spinner.service', 'horizon.framework.widgets.toast.service', - '$modal' + '$uibModal' ]; function uploadService(swiftAPI, basePath, model, $qExtensions, modalWaitSpinnerService, - toastService, $modal) { + toastService, $uibModal) { var service = { allowed: function allowed() { return $qExtensions.booleanAsPromise(true); }, perform: function perform() { - uploadModal(basePath + 'upload-object-modal.html', $modal) + uploadModal(basePath + 'upload-object-modal.html', $uibModal) .then(service.uploadObjectCallback); }, uploadObjectCallback: uploadObjectCallback @@ -121,16 +121,16 @@ 'horizon.dashboard.project.containers.containers-model', 'horizon.framework.util.q.extensions', 'horizon.framework.widgets.toast.service', - '$modal' + '$uibModal' ]; - function createFolderService(swiftAPI, basePath, model, $qExtensions, toastService, $modal) { + function createFolderService(swiftAPI, basePath, model, $qExtensions, toastService, $uibModal) { var service = { allowed: function allowed() { return $qExtensions.booleanAsPromise(true); }, perform: function perform() { - uploadModal(basePath + 'create-folder-modal.html', $modal) + uploadModal(basePath + 'create-folder-modal.html', $uibModal) .then(service.createFolderCallback); }, createFolderCallback: createFolderCallback @@ -161,10 +161,10 @@ 'horizon.dashboard.project.containers.basePath', 'horizon.framework.util.actions.action-result.service', 'horizon.framework.util.q.extensions', - '$modal' + '$uibModal' ]; - function deleteService(basePath, actionResultService, $qExtensions, $modal) { + function deleteService(basePath, actionResultService, $qExtensions, $uibModal) { return { allowed: function allowed() { return $qExtensions.booleanAsPromise(true); @@ -181,7 +181,7 @@ } }; - return $modal.open(localSpec).result.then(function finished() { + return $uibModal.open(localSpec).result.then(function finished() { return actionResultService.getActionResult().deleted( 'OS::Swift::Object', 'DELETED' ).result; diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-batch-actions.service.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-batch-actions.service.spec.js index ad93d8dbee..9116032e83 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-batch-actions.service.spec.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-batch-actions.service.spec.js @@ -66,10 +66,10 @@ }); describe('uploadService', function test() { - var $modal, uploadService; + var $uibModal, uploadService; - beforeEach(inject(function inject($injector, _$modal_) { - $modal = _$modal_; + beforeEach(inject(function inject($injector, _$uibModal_) { + $uibModal = _$uibModal_; uploadService = $injector.get( 'horizon.dashboard.project.containers.objects-batch-actions.upload' ); @@ -87,14 +87,14 @@ it('should create "upload file" modals', function test() { var deferred = $q.defer(); var result = { result: deferred.promise }; - spyOn($modal, 'open').and.returnValue(result); + spyOn($uibModal, 'open').and.returnValue(result); model.container = {name: 'ham'}; spyOn(uploadService, 'uploadObjectCallback'); uploadService.perform(); - expect($modal.open).toHaveBeenCalled(); - var spec = $modal.open.calls.mostRecent().args[0]; + expect($uibModal.open).toHaveBeenCalled(); + var spec = $uibModal.open.calls.mostRecent().args[0]; expect(spec.backdrop).toBeDefined(); expect(spec.controller).toBeDefined(); expect(spec.templateUrl).toEqual('/base/path/upload-object-modal.html'); @@ -130,10 +130,10 @@ }); describe('createFolderService', function test() { - var $modal, createFolderService; + var $uibModal, createFolderService; - beforeEach(inject(function inject($injector, _$modal_) { - $modal = _$modal_; + beforeEach(inject(function inject($injector, _$uibModal_) { + $uibModal = _$uibModal_; createFolderService = $injector.get( 'horizon.dashboard.project.containers.objects-batch-actions.create-folder' ); @@ -151,13 +151,13 @@ it('should create "create folder" modals', function test() { var deferred = $q.defer(); var result = {result: deferred.promise}; - spyOn($modal, 'open').and.returnValue(result); + spyOn($uibModal, 'open').and.returnValue(result); spyOn(createFolderService, 'createFolderCallback'); createFolderService.perform(); - expect($modal.open).toHaveBeenCalled(); - var spec = $modal.open.calls.mostRecent().args[0]; + expect($uibModal.open).toHaveBeenCalled(); + var spec = $uibModal.open.calls.mostRecent().args[0]; expect(spec.backdrop).toBeDefined(); expect(spec.controller).toBeDefined(); expect(spec.templateUrl).toEqual('/base/path/create-folder-modal.html'); @@ -186,14 +186,14 @@ }); describe('deleteService', function test() { - var actionResultService, deleteService, $modal, $q; + var actionResultService, deleteService, $uibModal, $q; - beforeEach(inject(function inject($injector, _$q_, _$modal_) { + beforeEach(inject(function inject($injector, _$q_, _$uibModal_) { actionResultService = $injector.get('horizon.framework.util.actions.action-result.service'); deleteService = $injector.get( 'horizon.dashboard.project.containers.objects-batch-actions.delete' ); - $modal = _$modal_; + $uibModal = _$uibModal_; $q = _$q_; })); @@ -210,13 +210,13 @@ // deferred to be resolved then the modal is "closed" in a bit var deferred = $q.defer(); var result = {result: deferred.promise}; - spyOn($modal, 'open').and.returnValue(result); + spyOn($uibModal, 'open').and.returnValue(result); spyOn(actionResultService, 'getActionResult').and.callThrough(); deleteService.perform(['one', 'two']); - expect($modal.open).toHaveBeenCalled(); - var spec = $modal.open.calls.mostRecent().args[0]; + expect($uibModal.open).toHaveBeenCalled(); + var spec = $uibModal.open.calls.mostRecent().args[0]; expect(spec.backdrop).toBeDefined(); expect(spec.controller).toEqual('DeleteObjectsModalController as ctrl'); expect(spec.templateUrl).toEqual('/base/path/delete-objects-modal.html'); diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-row-actions.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-row-actions.service.js index e60480457b..92371838aa 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-row-actions.service.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-row-actions.service.js @@ -93,10 +93,10 @@ 'horizon.dashboard.project.containers.basePath', 'horizon.dashboard.project.containers.containers-model', 'horizon.framework.util.q.extensions', - '$modal' + '$uibModal' ]; - function viewService(swiftAPI, basePath, model, $qExtensions, $modal) { + function viewService(swiftAPI, basePath, model, $qExtensions, $uibModal) { return { allowed: allowed, perform: perform @@ -124,7 +124,7 @@ } }; - $modal.open(localSpec); + $uibModal.open(localSpec); } } @@ -135,11 +135,11 @@ 'horizon.framework.util.q.extensions', 'horizon.framework.widgets.modal-wait-spinner.service', 'horizon.framework.widgets.toast.service', - '$modal' + '$uibModal' ]; function editService(swiftAPI, basePath, model, $qExtensions, modalWaitSpinnerService, - toastService, $modal) { + toastService, $uibModal) { return { allowed: allowed, perform: perform @@ -163,7 +163,7 @@ } } }; - return $modal.open(localSpec).result.then(editObjectCallback); + return $uibModal.open(localSpec).result.then(editObjectCallback); } function editObjectCallback(uploadInfo) { @@ -197,10 +197,10 @@ 'horizon.dashboard.project.containers.basePath', 'horizon.framework.util.actions.action-result.service', 'horizon.framework.util.q.extensions', - '$modal' + '$uibModal' ]; - function deleteService(basePath, actionResultService, $qExtensions, $modal) { + function deleteService(basePath, actionResultService, $qExtensions, $uibModal) { return { allowed: allowed, perform: perform @@ -222,7 +222,7 @@ } }; - return $modal.open(localSpec).result.then(function finished() { + return $uibModal.open(localSpec).result.then(function finished() { return actionResultService.getActionResult().deleted( 'OS::Swift::Object', file.name ).result; diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-row-actions.service.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-row-actions.service.spec.js index 51a822b356..f8e5936eb8 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-row-actions.service.spec.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/containers/objects-row-actions.service.spec.js @@ -29,14 +29,14 @@ $provide.value('$window', $window); })); - var rowActions, $modal, $rootScope, model; + var rowActions, $uibModal, $rootScope, model; - beforeEach(inject(function inject($injector, _$modal_, _$rootScope_) { + beforeEach(inject(function inject($injector, _$uibModal_, _$rootScope_) { var resourceService = $injector.get('horizon.framework.conf.resource-type-registry.service'); var objectResCode = $injector.get('horizon.dashboard.project.containers.object.resourceType'); rowActions = resourceService.getResourceType(objectResCode).itemActions; model = $injector.get('horizon.dashboard.project.containers.containers-model'); - $modal = _$modal_; + $uibModal = _$uibModal_; $rootScope = _$rootScope_; })); @@ -100,7 +100,7 @@ }); it('should open a dialog on perform()', function test() { - spyOn($modal, 'open'); + spyOn($uibModal, 'open'); var deferred = $q.defer(); spyOn(swiftAPI, 'getObjectDetails').and.returnValue(deferred.promise); model.container = {name: 'spam'}; @@ -117,8 +117,8 @@ }}); $rootScope.$apply(); - expect($modal.open).toHaveBeenCalled(); - var spec = $modal.open.calls.mostRecent().args[0]; + expect($uibModal.open).toHaveBeenCalled(); + var spec = $uibModal.open.calls.mostRecent().args[0]; expect(spec.backdrop).toBeDefined(); expect(spec.controller).toBeDefined(); expect(spec.templateUrl).toEqual('/base/path/object-details-modal.html'); @@ -150,14 +150,14 @@ // deferred to be resolved then the modal is "closed" in a bit var deferred = $q.defer(); var result = { result: deferred.promise }; - spyOn($modal, 'open').and.returnValue(result); + spyOn($uibModal, 'open').and.returnValue(result); spyOn(actionResultService, 'getActionResult').and.callThrough(); deleteService.perform({name: 'ham'}); $rootScope.$apply(); - expect($modal.open).toHaveBeenCalled(); - var spec = $modal.open.calls.mostRecent().args[0]; + expect($uibModal.open).toHaveBeenCalled(); + var spec = $uibModal.open.calls.mostRecent().args[0]; expect(spec.controller).toBeDefined(); expect(spec.templateUrl).toBeDefined(); expect(spec.resolve).toBeDefined(); @@ -201,7 +201,7 @@ var modalDeferred = $q.defer(); var apiDeferred = $q.defer(); var result = { result: modalDeferred.promise }; - spyOn($modal, 'open').and.returnValue(result); + spyOn($uibModal, 'open').and.returnValue(result); spyOn(modalWaitSpinnerService, 'showModalSpinner'); spyOn(modalWaitSpinnerService, 'hideModalSpinner'); spyOn(swiftAPI, 'uploadObject').and.returnValue(apiDeferred.promise); @@ -219,7 +219,7 @@ $rootScope.$apply(); // Check the string of functions called by this code path succeed - expect($modal.open).toHaveBeenCalled(); + expect($uibModal.open).toHaveBeenCalled(); expect(modalWaitSpinnerService.showModalSpinner).toHaveBeenCalled(); expect(swiftAPI.uploadObject).toHaveBeenCalled(); expect(toastService.add).toHaveBeenCalledWith('success', 'File /folder/ham uploaded.'); @@ -232,7 +232,7 @@ var modalDeferred = $q.defer(); var apiDeferred = $q.defer(); var result = { result: modalDeferred.promise }; - spyOn($modal, 'open').and.returnValue(result); + spyOn($uibModal, 'open').and.returnValue(result); spyOn(modalWaitSpinnerService, 'showModalSpinner'); spyOn(modalWaitSpinnerService, 'hideModalSpinner'); spyOn(swiftAPI, 'uploadObject').and.returnValue(apiDeferred.promise); @@ -253,7 +253,7 @@ expect(modalWaitSpinnerService.showModalSpinner).toHaveBeenCalled(); expect(swiftAPI.uploadObject).toHaveBeenCalled(); expect(modalWaitSpinnerService.hideModalSpinner).toHaveBeenCalled(); - expect($modal.open).toHaveBeenCalled(); + expect($uibModal.open).toHaveBeenCalled(); // Check the success branch is not called expect(model.updateContainer).not.toHaveBeenCalled(); diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.js index 1a6423d624..5cffddafc1 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.js @@ -22,7 +22,7 @@ .controller('LaunchInstanceCreateKeyPairController', LaunchInstanceCreateKeyPairController); LaunchInstanceCreateKeyPairController.$inject = [ - '$modalInstance', + '$uibModalInstance', 'existingKeypairs', 'horizon.app.core.openstack-service-api.nova', 'horizon.framework.widgets.toast.service', @@ -32,7 +32,7 @@ /** * @ngdoc controller * @name LaunchInstanceCreateKeyPairController - * @param {Object} $modalInstance + * @param {Object} $uibModalInstance * @param {Object} existingKeypairs * @param {Object} nova * @param {Object} toastService @@ -41,7 +41,7 @@ * Provide a dialog for creation of a new key pair. * @returns {undefined} Returns nothing */ - function LaunchInstanceCreateKeyPairController($modalInstance, existingKeypairs, nova, + function LaunchInstanceCreateKeyPairController($uibModalInstance, existingKeypairs, nova, toastService, keypairDownloadService) { var ctrl = this; @@ -87,7 +87,7 @@ keypairDownloadService.createAndDownloadKeypair(ctrl.keypair).then( function success(createdKeypair) { createdKeypair.regenerateUrl = nova.getRegenerateKeypairUrl(createdKeypair.name); - $modalInstance.close(createdKeypair); + $uibModalInstance.close(createdKeypair); }, function error() { var errorMessage = interpolate(gettext('Unable to generate "%s". Please try again.'), @@ -104,7 +104,7 @@ * Dismisses the modal */ function cancel() { - $modalInstance.dismiss(); + $uibModalInstance.dismiss(); } } diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.spec.js index af992b1ea3..e30e14d229 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.spec.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/create-keypair.controller.spec.js @@ -47,7 +47,7 @@ beforeEach(module('horizon.dashboard.project')); beforeEach(module(function ($provide) { - $provide.value('$modalInstance', modalInstanceMock); + $provide.value('$uibModalInstance', modalInstanceMock); $provide.value('horizon.framework.widgets.toast.service', toastServiceMock); $provide.value('existingKeypairs', mockExistingKeypairs); $provide.value( diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.js index e6219065aa..f9753a9c23 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.js @@ -22,7 +22,7 @@ .controller('LaunchInstanceImportKeyPairController', LaunchInstanceImportKeyPairController); LaunchInstanceImportKeyPairController.$inject = [ - '$modalInstance', + '$uibModalInstance', 'horizon.app.core.openstack-service-api.nova', 'horizon.framework.widgets.toast.service', 'horizon.dashboard.project.workflow.launch-instance.basePath' @@ -31,7 +31,7 @@ /** * @ngdoc controller * @name LaunchInstanceImportKeyPairController - * @param {Object} $modalInstance + * @param {Object} $uibModalInstance * @param {Object} novaAPI * @param {Object} toastService * @param {string} basePath @@ -39,7 +39,8 @@ * Provide a dialog for import of an existing ssh public key. * @returns {undefined} Returns nothing */ - function LaunchInstanceImportKeyPairController($modalInstance, novaAPI, toastService, basePath) { + function LaunchInstanceImportKeyPairController($uibModalInstance, novaAPI, + toastService, basePath) { var ctrl = this; ctrl.submit = submit; @@ -54,14 +55,14 @@ } function successCallback(data) { - $modalInstance.close(data.data); + $uibModalInstance.close(data.data); var successMsg = gettext('Successfully imported key pair %(name)s.'); toastService.add('success', interpolate(successMsg, { name: data.data.name }, true)); } function cancel() { - $modalInstance.dismiss(); + $uibModalInstance.dismiss(); } } diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.spec.js index a4b04e1547..5c5dd59ea6 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.spec.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.spec.js @@ -33,7 +33,7 @@ beforeEach(inject(function($injector, $controller, _$q_, _$rootScope_) { novaAPI = $injector.get('horizon.app.core.openstack-service-api.nova'); ctrl = $controller('LaunchInstanceImportKeyPairController', { - $modalInstance: modalInstanceMock + $uibModalInstance: modalInstanceMock }); $q = _$q_; $rootScope = _$rootScope_; diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.js index d3b8b737b5..83809b3598 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.js @@ -24,7 +24,7 @@ LaunchInstanceKeypairController.$inject = [ 'horizon.dashboard.project.workflow.launch-instance.basePath', 'launchInstanceModel', - '$modal', + '$uibModal', 'horizon.framework.widgets.toast.service', 'horizon.app.core.openstack-service-api.settings' ]; @@ -34,7 +34,7 @@ * @name LaunchInstanceKeypairController * @param {string} basePath * @param {Object} launchInstanceModel - * @param {Object} $modal + * @param {Object} $uibModal * @param {Object} toastService * @description * Allows selection of key pairs. @@ -43,7 +43,7 @@ function LaunchInstanceKeypairController( basePath, launchInstanceModel, - $modal, + $uibModal, toastService, settingsService ) { @@ -124,7 +124,7 @@ * @returns {undefined} No return value */ function createKeyPair() { - $modal.open({ + $uibModal.open({ templateUrl: basePath + 'keypair/create-keypair.html', controller: 'LaunchInstanceCreateKeyPairController as ctrl', windowClass: 'modal-dialog-wizard', @@ -160,7 +160,7 @@ * @returns {undefined} No return value */ function importKeyPair() { - $modal.open({ + $uibModal.open({ templateUrl: basePath + 'keypair/import-keypair.html', controller: 'LaunchInstanceImportKeyPairController as ctrl', windowClass: 'modal-dialog-wizard' diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.spec.js index 2ec86593e4..6e2e06244f 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.spec.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.spec.js @@ -20,7 +20,7 @@ describe('LaunchInstanceKeypairController', function() { var ctrl, q, settings; - var $modal = { open: angular.noop }; + var $uibModal = { open: angular.noop }; var toastServiceMock = {add: angular.noop}; beforeEach(module('horizon.dashboard.project')); @@ -34,7 +34,7 @@ }); beforeEach(module(function ($provide) { - $provide.value('$modal', $modal); + $provide.value('$uibModal', $uibModal); $provide.value('horizon.framework.widgets.toast.service', toastServiceMock); $provide.value('horizon.app.core.openstack-service-api.settings', { getSetting: function(setting) { @@ -100,25 +100,25 @@ }); it('createKeyPair opens a modal', function() { - spyOn($modal, 'open').and.returnValue({result: {then: angular.noop}}); + spyOn($uibModal, 'open').and.returnValue({result: {then: angular.noop}}); ctrl.createKeyPair(); - expect($modal.open).toHaveBeenCalled(); + expect($uibModal.open).toHaveBeenCalled(); }); it('should pass the create keypair submodal the existing keypairs', function() { - spyOn($modal, 'open').and.returnValue({ + spyOn($uibModal, 'open').and.returnValue({ result: {then: angular.noop} }); ctrl.createKeyPair(); - var modalParameters = $modal.open.calls.mostRecent().args[0]; + var modalParameters = $uibModal.open.calls.mostRecent().args[0]; expect(modalParameters.resolve.existingKeypairs()).toEqual(['key1','key2']); }); function getCreateKeypairModalCallback() { var result = {result: {then: angular.noop}}; spyOn(result.result, 'then'); - spyOn($modal, 'open').and.returnValue(result); + spyOn($uibModal, 'open').and.returnValue(result); ctrl.createKeyPair(); @@ -149,20 +149,20 @@ }); it('importKeyPair opens a modal', function() { - spyOn($modal, 'open').and.returnValue({result: {then: angular.noop}}); + spyOn($uibModal, 'open').and.returnValue({result: {then: angular.noop}}); ctrl.importKeyPair(); - expect($modal.open).toHaveBeenCalled(); + expect($uibModal.open).toHaveBeenCalled(); }); it('importKeyPairCallback is called', function() { var result = {result: {then: angular.noop}}; spyOn(result.result, 'then'); - spyOn($modal, 'open').and.returnValue(result); + spyOn($uibModal, 'open').and.returnValue(result); ctrl.importKeyPair(); var importKeypairModalcallback = result.result.then.calls.argsFor(0)[0]; var callbackInput = {name: "June"}; - $modal.open.calls.reset(); + $uibModal.open.calls.reset(); importKeypairModalcallback(callbackInput); expect(callbackInput.id).toBe("June"); }); diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-modal.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-modal.service.js index 99a2f0a86f..76f4ba2966 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-modal.service.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-modal.service.js @@ -24,12 +24,12 @@ ); LaunchInstanceModalService.$inject = [ - '$modal', + '$uibModal', '$window', 'horizon.dashboard.project.workflow.launch-instance.modal-spec' ]; - function LaunchInstanceModalService($modal, $window, modalSpec) { + function LaunchInstanceModalService($uibModal, $window, modalSpec) { var service = { open: open }; @@ -47,7 +47,7 @@ angular.extend(localSpec, modalSpec); - var launchInstanceModal = $modal.open(localSpec); + var launchInstanceModal = $uibModal.open(localSpec); var handleModalClose = function (redirectPropertyName) { return function () { if (launchContext && launchContext[redirectPropertyName]) { diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-modal.service.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-modal.service.spec.js index 99f4ce2747..3fe72282aa 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-modal.service.spec.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-modal.service.spec.js @@ -31,8 +31,8 @@ } }; $window = { location: { href: '/' } }; - $provide.value('$modal', modal); - $provide.value('$modalSpec', {}); + $provide.value('$uibModal', modal); + $provide.value('$uibModalSpec', {}); $provide.value('$window', $window); })); diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html index 30b54ce8ac..0a2332af38 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html @@ -32,7 +32,7 @@ + uib-btn-radio="option.value">{$ ::option.label $}
@@ -46,7 +46,7 @@ + uib-btn-radio="option.value">{$ ::option.label $} @@ -85,7 +85,7 @@ + uib-btn-radio="option.value">{$ ::option.label $} diff --git a/openstack_dashboard/static/app/core/images/steps/create-image/create-image.html b/openstack_dashboard/static/app/core/images/steps/create-image/create-image.html index b150844bfc..2208c3ecac 100644 --- a/openstack_dashboard/static/app/core/images/steps/create-image/create-image.html +++ b/openstack_dashboard/static/app/core/images/steps/create-image/create-image.html @@ -62,7 +62,7 @@ + uib-btn-radio="option.value">{$ ::option.label $} @@ -84,7 +84,7 @@
- + {$ ctrl.uploadProgress $}%

{$ ::option.label $} + uib-btn-radio="option.value">{$ ::option.label $} @@ -234,7 +234,7 @@ + uib-btn-radio="option.value">{$ ::option.label $} @@ -249,7 +249,7 @@ + uib-btn-radio="option.value">{$ ::option.label $} diff --git a/openstack_dashboard/static/app/core/images/steps/edit-image/edit-image.html b/openstack_dashboard/static/app/core/images/steps/edit-image/edit-image.html index 348dd2261b..9949bcd264 100644 --- a/openstack_dashboard/static/app/core/images/steps/edit-image/edit-image.html +++ b/openstack_dashboard/static/app/core/images/steps/edit-image/edit-image.html @@ -123,7 +123,7 @@ + uib-btn-radio="option.value">{$ ::option.label $} @@ -136,7 +136,7 @@ + uib-btn-radio="option.value">{$ ::option.label $} diff --git a/openstack_dashboard/static/app/core/metadata/modal/modal.controller.js b/openstack_dashboard/static/app/core/metadata/modal/modal.controller.js index 83fa1c2e27..4816166e35 100644 --- a/openstack_dashboard/static/app/core/metadata/modal/modal.controller.js +++ b/openstack_dashboard/static/app/core/metadata/modal/modal.controller.js @@ -22,11 +22,11 @@ .controller('MetadataModalController', MetadataModalController); MetadataModalController.$inject = [ - '$modalInstance', + '$uibModalInstance', 'horizon.app.core.metadata.service', 'horizon.framework.widgets.metadata.tree.service', 'horizon.framework.widgets.toast.service', - // Dependencies injected with resolve by $modal.open + // Dependencies injected with resolve by $uibModal.open 'available', 'existing', 'params' @@ -39,7 +39,7 @@ * Controller used by `ModalService` */ function MetadataModalController( - $modalInstance, metadataService, metadataTreeService, + $uibModalInstance, metadataService, metadataTreeService, toastService, available, existing, params ) { var ctrl = this; @@ -77,12 +77,12 @@ } function cancel() { - $modalInstance.dismiss('cancel'); + $uibModalInstance.dismiss('cancel'); } function onEditSuccess() { toastService.add('success', gettext('Metadata was successfully updated.')); - $modalInstance.close(); + $uibModalInstance.close(); } function onEditFailure() { diff --git a/openstack_dashboard/static/app/core/metadata/modal/modal.controller.spec.js b/openstack_dashboard/static/app/core/metadata/modal/modal.controller.spec.js index 790e879f2c..24c89e97b6 100644 --- a/openstack_dashboard/static/app/core/metadata/modal/modal.controller.spec.js +++ b/openstack_dashboard/static/app/core/metadata/modal/modal.controller.spec.js @@ -112,7 +112,7 @@ function createController() { //Purposely use different cases in available and existing. return $controller('MetadataModalController', { - '$modalInstance': modalInstance, + '$uibModalInstance': modalInstance, 'horizon.framework.widgets.metadata.tree.service': treeService, 'horizon.app.core.metadata.service': metadataService, 'available': {data: {items: [availableItem]}}, diff --git a/openstack_dashboard/static/app/core/metadata/modal/modal.service.js b/openstack_dashboard/static/app/core/metadata/modal/modal.service.js index 928228a2fa..f376f50487 100644 --- a/openstack_dashboard/static/app/core/metadata/modal/modal.service.js +++ b/openstack_dashboard/static/app/core/metadata/modal/modal.service.js @@ -21,7 +21,7 @@ .factory('horizon.app.core.metadata.modal.service', modalService); modalService.$inject = [ - '$modal', + '$uibModal', 'horizon.app.core.basePath', 'horizon.app.core.metadata.service', 'horizon.app.core.metadata.modal.constants' @@ -31,7 +31,7 @@ * @ngdoc service * @name modalService */ - function modalService($modal, path, metadataService, modalConstants) { + function modalService($uibModal, path, metadataService, modalConstants) { var service = { open: open }; @@ -66,7 +66,7 @@ resolve: resolve, templateUrl: path + 'metadata/modal/modal.html' }; - return $modal.open(angular.extend(modalParams, modalConstants)); + return $uibModal.open(angular.extend(modalParams, modalConstants)); } } diff --git a/openstack_dashboard/static/app/core/metadata/modal/modal.service.spec.js b/openstack_dashboard/static/app/core/metadata/modal/modal.service.spec.js index d751b32f45..4344e7a0d2 100644 --- a/openstack_dashboard/static/app/core/metadata/modal/modal.service.spec.js +++ b/openstack_dashboard/static/app/core/metadata/modal/modal.service.spec.js @@ -19,12 +19,12 @@ describe('horizon.app.core.metadata.modal', function() { describe('service.modalservice', function() { - var modalService, metadataService, $modal; + var modalService, metadataService, $uibModal; beforeEach(module('ui.bootstrap', function($provide) { - $modal = jasmine.createSpyObj('$modal', ['open']); + $uibModal = jasmine.createSpyObj('$uibModal', ['open']); - $provide.value('$modal', $modal); + $provide.value('$uibModal', $uibModal); })); beforeEach(module('horizon.app.core', function($provide) { @@ -46,12 +46,12 @@ expect(modalService.open).toBeDefined(); }); - it('should invoke $modal.open with correct params', function() { + it('should invoke $uibModal.open with correct params', function() { modalService.open('resource', 'id'); - expect($modal.open).toHaveBeenCalled(); + expect($uibModal.open).toHaveBeenCalled(); - var args = $modal.open.calls.argsFor(0)[0]; + var args = $uibModal.open.calls.argsFor(0)[0]; expect(args.templateUrl).toEqual('/a/sample/path/metadata/modal/modal.html'); expect(args.resolve.params()).toEqual({resource: 'resource', id: 'id'}); });