Merge "Fix instance launch dialog under MSIE11" into stable/ocata

This commit is contained in:
Jenkins 2017-06-13 15:09:32 +00:00 committed by Gerrit Code Review
commit 19598e41a0
2 changed files with 7 additions and 8 deletions

View File

@ -237,7 +237,10 @@
promise = $q.all([
novaAPI.getAvailabilityZones().then(onGetAvailabilityZones, noop),
novaAPI.getFlavors(true, true).then(onGetFlavors, noop),
novaAPI.getFlavors({
is_public: true,
get_extras: true
}).then(onGetFlavors, noop),
novaAPI.getKeypairs().then(onGetKeypairs, noop),
novaAPI.getLimits(true).then(onGetNovaLimits, noop),
securityGroup.query().then(onGetSecurityGroups, noop),

View File

@ -459,13 +459,9 @@
* The listing result is an object with property "items". Each item is
* a flavor.
*
* @param {boolean} isPublic (optional)
* True if public flavors should be returned. If not specified, the API
* will return public flavors by default for Admins and only project
* flavors for non-admins.
* @param {boolean} getExtras (optional)
* Also retrieve the extra specs. This is expensive (one extra underlying
* call per flavor).
* @param {Object} params (optional)
* Parameters that should be passed to the API call. Currently those can
* be "is_public" and "get_extras", both of them boolean.
* @returns {Object} The result of the API call
*/
function getFlavors(params) {