summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-13 15:09:32 +0000
committerGerrit Code Review <review@openstack.org>2017-06-13 15:09:32 +0000
commit19598e41a03d7f4df277b86677e56fa089905448 (patch)
treefa23067302a28c131be38d4a0c7c2f9b8f2fffc2
parenta1d1615459b33434030205da160c2becc0b1080c (diff)
parentafb31d55adf684048be7db6451cbea40317dec8b (diff)
Merge "Fix instance launch dialog under MSIE11" into stable/ocata
-rw-r--r--openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js5
-rw-r--r--openstack_dashboard/static/app/core/openstack-service-api/nova.service.js10
2 files changed, 7 insertions, 8 deletions
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
index f96a277..deebfdf 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
@@ -237,7 +237,10 @@
237 237
238 promise = $q.all([ 238 promise = $q.all([
239 novaAPI.getAvailabilityZones().then(onGetAvailabilityZones, noop), 239 novaAPI.getAvailabilityZones().then(onGetAvailabilityZones, noop),
240 novaAPI.getFlavors(true, true).then(onGetFlavors, noop), 240 novaAPI.getFlavors({
241 is_public: true,
242 get_extras: true
243 }).then(onGetFlavors, noop),
241 novaAPI.getKeypairs().then(onGetKeypairs, noop), 244 novaAPI.getKeypairs().then(onGetKeypairs, noop),
242 novaAPI.getLimits(true).then(onGetNovaLimits, noop), 245 novaAPI.getLimits(true).then(onGetNovaLimits, noop),
243 securityGroup.query().then(onGetSecurityGroups, noop), 246 securityGroup.query().then(onGetSecurityGroups, noop),
diff --git a/openstack_dashboard/static/app/core/openstack-service-api/nova.service.js b/openstack_dashboard/static/app/core/openstack-service-api/nova.service.js
index cd06208..74be63d 100644
--- a/openstack_dashboard/static/app/core/openstack-service-api/nova.service.js
+++ b/openstack_dashboard/static/app/core/openstack-service-api/nova.service.js
@@ -459,13 +459,9 @@
459 * The listing result is an object with property "items". Each item is 459 * The listing result is an object with property "items". Each item is
460 * a flavor. 460 * a flavor.
461 * 461 *
462 * @param {boolean} isPublic (optional) 462 * @param {Object} params (optional)
463 * True if public flavors should be returned. If not specified, the API 463 * Parameters that should be passed to the API call. Currently those can
464 * will return public flavors by default for Admins and only project 464 * be "is_public" and "get_extras", both of them boolean.
465 * flavors for non-admins.
466 * @param {boolean} getExtras (optional)
467 * Also retrieve the extra specs. This is expensive (one extra underlying
468 * call per flavor).
469 * @returns {Object} The result of the API call 465 * @returns {Object} The result of the API call
470 */ 466 */
471 function getFlavors(params) { 467 function getFlavors(params) {