openstack
/
horizon
Code Issues Proposed changes

Merge "Fix key import in angular Launch Instance" into stable/mitaka

This commit is contained in:
Jenkins 2016-05-14 10:51:30 +00:00 committed by Gerrit Code Review
parent 38b38cf111 c570ee943f
commit 0b35ce5374
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.js
View File

@ -49,10 +49,10 @@
}
function successCallback(data) {
$modalInstance.close(data);
$modalInstance.close(data.data);
var successMsg = gettext('Successfully imported key pair %(name)s.');
toastService.add('success', interpolate(successMsg, { name: data.name }, true));
toastService.add('success', interpolate(successMsg, { name: data.data.name }, true));
}
function cancel() {

4
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/import-keypair.controller.spec.js
View File

@ -20,7 +20,7 @@
describe('Launch Instance Import Key Pair Controller', function() {
var novaAPI, ctrl, toastService, $q, $rootScope;
var model = { name: 'newKeypair', public_key: '' };
var data = { data: { name: 'newKeypair', public_key: '' } };
var modalInstanceMock = {
close: angular.noop,
dismiss: angular.noop
@ -58,7 +58,7 @@
ctrl.submit();
deferredSuccess.resolve(model);
deferredSuccess.resolve(data);
$rootScope.$apply();
expect(novaAPI.createKeypair).toHaveBeenCalled();