You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2023/01/11 16:27:57 UTC
[cloudstack] 01/01: Merge remote-tracking branch 'apache/4.17'
This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit c1b17d2c42b38207dffef405cc8f76cb08ccc4b7
Merge: c2350f96755 d33d84fa0fb
Author: Wei Zhou <we...@apache.org>
AuthorDate: Wed Jan 11 17:23:12 2023 +0100
Merge remote-tracking branch 'apache/4.17'
.../java/com/cloud/configuration/ConfigurationManagerImpl.java | 7 ++++++-
ui/src/views/offering/AddNetworkOffering.vue | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --cc server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 27837af8465,82c54269b58..ba5bc881604
mode 100644,100755..100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
diff --cc ui/src/views/offering/AddNetworkOffering.vue
index e8443047683,492950187e0..abdb9da05f9
--- a/ui/src/views/offering/AddNetworkOffering.vue
+++ b/ui/src/views/offering/AddNetworkOffering.vue
@@@ -237,13 -237,7 +237,13 @@@
</a-radio-button>
</a-radio-group>
</a-form-item>
- <a-form-item>
- <a-form-item name="serviceofferingid" ref="serviceofferingid" v-if="isVirtualRouterForAtLeastOneService || isVpcVirtualRouterForAtLeastOneService">
++ <a-form-item name="serviceofferingid" ref="serviceofferingid">
+ <a-alert v-if="!isVirtualRouterForAtLeastOneService" type="warning" style="margin-bottom: 10px">
+ <template #message>
+ <span v-if="guestType === 'l2'" v-html="$t('message.vr.alert.upon.network.offering.creation.l2')" />
+ <span v-else v-html="$t('message.vr.alert.upon.network.offering.creation.others')" />
+ </template>
+ </a-alert>
<template #label>
<tooltip-label :title="$t('label.serviceofferingid')" :tooltip="apiParams.serviceofferingid.description"/>
</template>