You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/01/11 13:01:35 UTC
[cloudstack] branch 4.17 updated: server/UI: fix some issues with network offering details (#7057)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.17 by this push:
new d33d84fa0fb server/UI: fix some issues with network offering details (#7057)
d33d84fa0fb is described below
commit d33d84fa0fb6742ff8fdf9fccd01a337950dbd88
Author: Wei Zhou <we...@apache.org>
AuthorDate: Wed Jan 11 14:01:28 2023 +0100
server/UI: fix some issues with network offering details (#7057)
---
.../java/com/cloud/configuration/ConfigurationManagerImpl.java | 7 ++++++-
ui/src/views/offering/AddNetworkOffering.vue | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 9dc1a5201be..82c54269b58 100755
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -6408,7 +6408,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
detailsVO.add(new NetworkOfferingDetailsVO(offering.getId(), Detail.internetProtocol, String.valueOf(internetProtocol), true));
}
if (!detailsVO.isEmpty()) {
- networkOfferingDetailsDao.saveDetails(detailsVO);
+ for (NetworkOfferingDetailsVO detail : detailsVO) {
+ networkOfferingDetailsDao.persist(detail);
+ }
}
}
}
@@ -6768,6 +6770,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
annotationDao.removeByEntityType(AnnotationService.EntityType.NETWORK_OFFERING.name(), offering.getUuid());
+
+ networkOfferingDetailsDao.removeDetails(offeringId);
+
if (_networkOfferingDao.remove(offeringId)) {
return true;
} else {
diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue
index 4a7aae1d7a4..492950187e0 100644
--- a/ui/src/views/offering/AddNetworkOffering.vue
+++ b/ui/src/views/offering/AddNetworkOffering.vue
@@ -178,7 +178,7 @@
</a-radio-button>
</a-radio-group>
</a-form-item>
- <a-form-item>
+ <a-form-item name="maclearning" ref="maclearning">
<template #label>
<tooltip-label :title="$t('label.maclearning')" :tooltip="$t('message.network.offering.mac.learning')"/>
</template>
@@ -237,7 +237,7 @@
</a-radio-button>
</a-radio-group>
</a-form-item>
- <a-form-item v-if="isVirtualRouterForAtLeastOneService || isVpcVirtualRouterForAtLeastOneService">
+ <a-form-item name="serviceofferingid" ref="serviceofferingid" v-if="isVirtualRouterForAtLeastOneService || isVpcVirtualRouterForAtLeastOneService">
<template #label>
<tooltip-label :title="$t('label.serviceofferingid')" :tooltip="apiParams.serviceofferingid.description"/>
</template>