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

Auto-Assignment link missing in Target Filter view (caused by NPE in TargetFilterTable) (#835)

Browse Source 
* Add fallback to ActionType.FORCED for auto assignment filters

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* add comment

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* improve javadoc

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>
This commit is contained in:
Stefan Behl
2019-05-09 17:09:35 +02:00
committed by Dominic Schabel
parent b4ec3478c4
commit f16f986eed
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java
View File

@@ -13,6 +13,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.hawkbit.repository.TargetFilterQueryManagement; import org.eclipse.hawkbit.repository.TargetFilterQueryManagement;
import org.eclipse.hawkbit.repository.model.Action.ActionType;
import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.DistributionSet;
import org.eclipse.hawkbit.repository.model.TargetFilterQuery; import org.eclipse.hawkbit.repository.model.TargetFilterQuery;
import org.eclipse.hawkbit.ui.common.UserDetailsFormatter; import org.eclipse.hawkbit.ui.common.UserDetailsFormatter;
@@ -104,8 +105,13 @@ public class TargetFilterBeanQuery extends AbstractBeanQuery<ProxyTargetFilter>
final DistributionSet distributionSet = tarFilterQuery.getAutoAssignDistributionSet(); final DistributionSet distributionSet = tarFilterQuery.getAutoAssignDistributionSet();
if (distributionSet != null) { if (distributionSet != null) {
proxyTarFilter.setAutoAssignDistributionSet(new ProxyDistribution(distributionSet)); proxyTarFilter.setAutoAssignDistributionSet(new ProxyDistribution(distributionSet));
proxyTarFilter.setAutoAssignActionType(tarFilterQuery.getAutoAssignActionType()); // we need to apply a fallback since the action type field has
// been added belatedly (and might be null for older filters)
final ActionType autoAssignActionType = tarFilterQuery.getAutoAssignActionType();
proxyTarFilter.setAutoAssignActionType(
autoAssignActionType != null ? autoAssignActionType : ActionType.FORCED);
} }
proxyTargetFilter.add(proxyTarFilter); proxyTargetFilter.add(proxyTarFilter);
} }
return proxyTargetFilter; return proxyTargetFilter;