#675 serialize restricted values also for checkbox and radio

alfio-event · Aug 30, 2019 · 126642a · 126642a
1 parent 17987d8
commit 126642a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/alfio/manager/EventManager.java b/src/main/java/alfio/manager/EventManager.java
@@ -25,6 +25,7 @@
 import alfio.model.PromoCodeDiscount.DiscountType;
 import alfio.model.Ticket.TicketStatus;
 import alfio.model.TicketFieldConfiguration.Context;
+import alfio.model.api.v1.admin.EventCreationRequest;
 import alfio.model.modification.*;
 import alfio.model.modification.EventModification.AdditionalField;
 import alfio.model.result.ErrorCode;
@@ -239,11 +240,11 @@ private void createAdditionalFields(EventAndOrganizationId event, EventModificat
     }
 
     private static String toSerializedRestrictedValues(EventModification.WithRestrictedValues f) {
-        return "select".equals(f.getType()) ? generateJsonForList(f.getRestrictedValuesAsString()) : null;
+        return EventCreationRequest.WITH_RESTRICTED_VALUES.contains(f.getType()) ? generateJsonForList(f.getRestrictedValuesAsString()) : null;
     }
 
     private static String toSerializedDisabledValues(EventModification.WithRestrictedValues f) {
-        return "select".equals(f.getType()) ? generateJsonForList(f.getDisabledValuesAsString()) : null;
+        return EventCreationRequest.WITH_RESTRICTED_VALUES.contains(f.getType()) ? generateJsonForList(f.getDisabledValuesAsString()) : null;
     }
 
     private static String generateJsonForList(Collection<?> values) {

diff --git a/src/main/java/alfio/model/api/v1/admin/EventCreationRequest.java b/src/main/java/alfio/model/api/v1/admin/EventCreationRequest.java
@@ -370,6 +370,8 @@ enum AdditionalInfoType {
 
     }
 
+    public static Set<String> WITH_RESTRICTED_VALUES = Set.of(AdditionalInfoType.LIST_BOX.code, AdditionalInfoType.CHECKBOX.code, AdditionalInfoType.RADIO.code);
+
     @Getter
     @AllArgsConstructor
     public static class ContentLengthRequest {