openstack
/
horizon
Code Issues Proposed changes

Merge "Show a toast with success on instance creation"

This commit is contained in:
Jenkins 2015-12-17 11:13:15 +00:00 committed by Gerrit Code Review
parent c7b60085ee 2c7ae7efc9
commit 64869259a0
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
View File

@ -26,7 +26,8 @@
'horizon.app.core.openstack-service-api.nova',
'horizon.app.core.openstack-service-api.novaExtensions',
'horizon.app.core.openstack-service-api.security-group',
'horizon.app.core.openstack-service-api.serviceCatalog'
'horizon.app.core.openstack-service-api.serviceCatalog',
'horizon.framework.widgets.toast.service'
];
/**
@ -51,7 +52,8 @@
novaAPI,
novaExtensions,
securityGroup,
serviceCatalog
serviceCatalog,
toast
) {
var initPromise;
@ -245,7 +247,13 @@
setFinalSpecKeyPairs(finalSpec);
setFinalSpecSecurityGroups(finalSpec);
return novaAPI.createServer(finalSpec);
return novaAPI.createServer(finalSpec).then(successMessage);
}
function successMessage() {
var numberInstances = model.newInstanceSpec.instance_count;
var message = ngettext('Instance launched.', '%s instances launched.', numberInstances);
toast.add('success', interpolate(message, [numberInstances]));
}
function cleanNullProperties(finalSpec) {

10
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
View File

@ -55,7 +55,11 @@
$provide.value('horizon.app.core.openstack-service-api.nova', {
createServer: function(finalSpec) {
return finalSpec;
return {
then: function () {
return finalSpec;
}
};
},
getAvailabilityZones: function() {
var zones = [
@ -172,6 +176,10 @@
});
$provide.value('horizon.app.core.openstack-service-api.keystone', {});
$provide.value('horizon.framework.widgets.toast.service', {
add: function() {}
});
}));
beforeEach(inject(function(launchInstanceModel, $rootScope, _$q_) {