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

Fix for the max assignments.

Browse Source
This commit is contained in:
gah6kor
2016-07-18 15:04:41 +02:00
parent 205de032e1
commit 1cef0b4d46
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
View File

@@ -70,10 +70,10 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
protected void populateDetailsWidget() { protected void populateDetailsWidget() {
String maxAssign = HawkbitCommonUtil.SP_STRING_EMPTY; String maxAssign = HawkbitCommonUtil.SP_STRING_EMPTY;
if (getSelectedBaseEntity() != null) { if (getSelectedBaseEntity() != null) {
if (getSelectedBaseEntity().getType().getMaxAssignments() == Integer.MAX_VALUE) { if (getSelectedBaseEntity().getType().getMaxAssignments() == 1) {
maxAssign = getI18n().get("label.multiAssign.type");
} else {
maxAssign = getI18n().get("label.singleAssign.type"); maxAssign = getI18n().get("label.singleAssign.type");
} else {
maxAssign = getI18n().get("label.multiAssign.type");
} }
updateSoftwareModuleDetailsLayout(getSelectedBaseEntity().getType().getName(), updateSoftwareModuleDetailsLayout(getSelectedBaseEntity().getType().getName(),
getSelectedBaseEntity().getVendor(), maxAssign); getSelectedBaseEntity().getVendor(), maxAssign);

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
View File

@@ -181,7 +181,7 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
* type is drroped, then add to the list. * type is drroped, then add to the list.
*/ */
if (module.getType().getMaxAssignments() == Integer.MAX_VALUE) { if (module.getType().getMaxAssignments() > 1) {
assignedSWModule.get(module.getType().getName()).append("</br>").append("<I>") assignedSWModule.get(module.getType().getName()).append("</br>").append("<I>")
.append(getUnsavedAssigedSwModule(module.getName(), module.getVersion())).append("</I>"); .append(getUnsavedAssigedSwModule(module.getName(), module.getVersion())).append("</I>");
} }

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
View File

@@ -295,7 +295,7 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
private void handleSoftwareCase(final Map<Long, HashSet<SoftwareModuleIdName>> map, private void handleSoftwareCase(final Map<Long, HashSet<SoftwareModuleIdName>> map,
final SoftwareModule softwareModule, final SoftwareModuleIdName softwareModuleIdName) { final SoftwareModule softwareModule, final SoftwareModuleIdName softwareModuleIdName) {
if (softwareModule.getType().getMaxAssignments() == Integer.MAX_VALUE) { if (softwareModule.getType().getMaxAssignments() > 1) {
if (!map.containsKey(softwareModule.getType().getId())) { if (!map.containsKey(softwareModule.getType().getId())) {
map.put(softwareModule.getType().getId(), new HashSet<SoftwareModuleIdName>()); map.put(softwareModule.getType().getId(), new HashSet<SoftwareModuleIdName>());
} }

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
View File

@@ -99,10 +99,10 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
private void populateDetails() { private void populateDetails() {
String maxAssign = HawkbitCommonUtil.SP_STRING_EMPTY; String maxAssign = HawkbitCommonUtil.SP_STRING_EMPTY;
if (getSelectedBaseEntity() != null) { if (getSelectedBaseEntity() != null) {
if (getSelectedBaseEntity().getType().getMaxAssignments() == Integer.MAX_VALUE) { if (getSelectedBaseEntity().getType().getMaxAssignments() == 1) {
maxAssign = getI18n().get("label.multiAssign.type");
} else {
maxAssign = getI18n().get("label.singleAssign.type"); maxAssign = getI18n().get("label.singleAssign.type");
} else {
maxAssign = getI18n().get("label.multiAssign.type");
} }
updateSwModuleDetailsLayout(getSelectedBaseEntity().getType().getName(), updateSwModuleDetailsLayout(getSelectedBaseEntity().getType().getName(),
getSelectedBaseEntity().getVendor(), maxAssign); getSelectedBaseEntity().getVendor(), maxAssign);