openstack/magnum-ui
Code Issues Proposed changes

Update $modal to $uibModal

Browse Source 
Due to updating XStatic-Angular-Bootstrap to 2.2.0.0,
$modal is deprecated, so we need to use $uibModal.
This patch updates $modal to $uibModal.

Change-Id: I3c0881eb740ad97dfd1b450966e72db99b489b9c
Closes-Bug: #1651054
This commit is contained in:
Shu Muto 2016-12-19 16:42:24 +09:00
parent 387dad0af1
commit c5dacdb58a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
magnum_ui/static/dashboard/container-infra/clusters/sign-certificate/sign-certificate.service.js
View File

@ -27,7 +27,7 @@
signCertificateService); signCertificateService);
signCertificateService.$inject = [ signCertificateService.$inject = [
'$modal', '$uibModal',
'horizon.app.core.openstack-service-api.magnum', 'horizon.app.core.openstack-service-api.magnum',
'horizon.framework.util.actions.action-result.service', 'horizon.framework.util.actions.action-result.service',
'horizon.framework.util.i18n.gettext', 'horizon.framework.util.i18n.gettext',
@ -39,7 +39,7 @@
]; ];
function signCertificateService( function signCertificateService(
$modal, magnum, actionResult, gettext, $qExtensions, toast, basePath, resourceType, model $uibModal, magnum, actionResult, gettext, $qExtensions, toast, basePath, resourceType, model
) { ) {
var message = { var message = {
@ -59,19 +59,18 @@
function initAction() { function initAction() {
} }
function signCertificateModal(html, $modal) { function signCertificateModal() {
var localSpec = { var localSpec = {
backdrop: 'static', backdrop: 'static',
controller: 'horizon.dashboard.container-infra.clusters.signCertificateController as ctrl', controller: 'horizon.dashboard.container-infra.clusters.signCertificateController as ctrl',
templateUrl: html templateUrl: basePath + 'sign-certificate/sign-certificate-modal.html'
}; };
return $modal.open(localSpec).result; return $uibModal.open(localSpec).result;
} }
function perform(selected) { function perform(selected) {
model.init(selected.id); model.init(selected.id);
return signCertificateModal(basePath + 'sign-certificate/sign-certificate-modal.html', $modal) return signCertificateModal().then(submit);
.then(submit);
} }
function allowed() { function allowed() {

4
magnum_ui/static/dashboard/container-infra/clusters/sign-certificate/sign-certificate.service.spec.js
View File

@ -40,7 +40,7 @@
beforeEach(module('horizon.framework')); beforeEach(module('horizon.framework'));
beforeEach(module('horizon.dashboard.container-infra.clusters')); beforeEach(module('horizon.dashboard.container-infra.clusters'));
beforeEach(inject(function($injector, _$rootScope_, _$q_, $modal) { beforeEach(inject(function($injector, _$rootScope_, _$q_, $uibModal) {
$q = _$q_; $q = _$q_;
service = $injector.get( service = $injector.get(
'horizon.dashboard.container-infra.clusters.sign-certificate.service'); 'horizon.dashboard.container-infra.clusters.sign-certificate.service');
@ -54,7 +54,7 @@
fakeDeferred.resolve(fakesignCertificate); fakeDeferred.resolve(fakesignCertificate);
spyOn(model, 'signCertificate').and.returnValue(fakeDeferred.promise); spyOn(model, 'signCertificate').and.returnValue(fakeDeferred.promise);
spyOn($modal, 'open').and.returnValue(fakeModal); spyOn($uibModal, 'open').and.returnValue(fakeModal);
})); }));
it('should pass allow()', function() { it('should pass allow()', function() {