Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 7743b24

Browse files
1 parent 0dba091 commit 7743b24

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignEditForm.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import java.util.HashSet;
2626
import java.util.stream.Collectors;
2727

28+
import org.apache.commons.collections.CollectionUtils;
29+
2830
import com.vaadin.icons.VaadinIcons;
2931
import com.vaadin.shared.ui.ContentMode;
3032
import com.vaadin.shared.ui.MarginInfo;
@@ -170,12 +172,16 @@ public CampaignDto getValue() {
170172
@Override
171173
public void setValue(CampaignDto newFieldValue) throws ReadOnlyException, Converter.ConversionException {
172174
super.setValue(newFieldValue);
173-
campaignFormsGridComponent.setSavedItems(new ArrayList<>(newFieldValue.getCampaignFormMetas()));
174-
campaignDashboardGridComponent.setSavedItems(
175-
newFieldValue.getCampaignDashboardElements()
176-
.stream()
177-
.sorted(Comparator.comparingInt(CampaignDashboardElement::getOrder))
178-
.collect(Collectors.toList()));
175+
campaignFormsGridComponent
176+
.setSavedItems(newFieldValue.getCampaignFormMetas() != null ? new ArrayList<>(newFieldValue.getCampaignFormMetas()) : new ArrayList<>());
177+
178+
if (CollectionUtils.isNotEmpty(newFieldValue.getCampaignDashboardElements())) {
179+
campaignDashboardGridComponent.setSavedItems(
180+
newFieldValue.getCampaignDashboardElements()
181+
.stream()
182+
.sorted(Comparator.comparingInt(CampaignDashboardElement::getOrder))
183+
.collect(Collectors.toList()));
184+
}
179185
}
180186

181187
@Override

0 commit comments

Comments
 (0)