apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'apache/4.17'

Browse Source
This commit is contained in:
Wei Zhou 2023-01-11 17:23:12 +01:00
commit c1b17d2c42
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -6501,7 +6501,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);
}
}
}
}
@ -6872,6 +6874,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 {

4
ui/src/views/offering/AddNetworkOffering.vue
View File

@ -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>
<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')" />