lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix for the entity lock exception for unassign soft module from DS

Browse Source 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
This commit is contained in:
Gaurav
2016-08-04 17:36:28 +02:00
parent 30a88cc8f6
commit 303a668f16
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsTable.java
View File

@@ -186,12 +186,19 @@ public class SoftwareModuleDetailsTable extends Table {
private void unassignSW(final ClickEvent event, final DistributionSet distributionSet, private void unassignSW(final ClickEvent event, final DistributionSet distributionSet,
final Set<SoftwareModule> alreadyAssignedSwModules) { final Set<SoftwareModule> alreadyAssignedSwModules) {
final SoftwareModule unAssignedSw = getSoftwareModule(event.getButton().getId(), alreadyAssignedSwModules); final SoftwareModule unAssignedSw = getSoftwareModule(event.getButton().getId(), alreadyAssignedSwModules);
final DistributionSet newDistributionSet = distributionSetManagement.unassignSoftwareModule(distributionSet, if (distributionSetManagement.isDistributionSetInUse(distributionSet)) {
unAssignedSw); uiNotification.displayValidationError(
manageDistUIState.setLastSelectedEntity(DistributionSetIdName.generate(newDistributionSet)); String.format("Distribution set %s:%s is already assigned to targets and cannot be changed",
eventBus.publish(this, new DistributionTableEvent(BaseEntityEventType.SELECTED_ENTITY, newDistributionSet)); distributionSet.getName(), distributionSet.getVersion()));
eventBus.publish(this, DistributionsUIEvent.ORDER_BY_DISTRIBUTION); } else {
uiNotification.displaySuccess(i18n.get("message.sw.unassigned", unAssignedSw.getName())); final DistributionSet newDistributionSet = distributionSetManagement.unassignSoftwareModule(distributionSet,
unAssignedSw);
manageDistUIState.setLastSelectedEntity(DistributionSetIdName.generate(newDistributionSet));
eventBus.publish(this, new DistributionTableEvent(BaseEntityEventType.SELECTED_ENTITY, newDistributionSet));
eventBus.publish(this, DistributionsUIEvent.ORDER_BY_DISTRIBUTION);
uiNotification.displaySuccess(i18n.get("message.sw.unassigned", unAssignedSw.getName()));
}
} }
private static boolean isSoftModAvaiableForSoftType(final Set<SoftwareModule> swModulesSet, private static boolean isSoftModAvaiableForSoftType(final Set<SoftwareModule> swModulesSet,