etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

server/UI: fix some issues with network offering details (#7057)

This commit is contained in:
Wei Zhou 2023-01-11 14:01:28 +01:00 committed by GitHub
parent 03674ce174
commit d33d84fa0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -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 {

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 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>