Merge pull request #132 from Bahmni/fix-appointments-list-view

Fix | Handle null value for customPersonAttributeTypes
Bahmni · Sep 19, 2023 · 4cac231 · 4cac231
2 parents 8014727 + 034e33d
commit 4cac231
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/omod/src/main/java/org/openmrs/module/appointments/web/mapper/AppointmentMapper.java b/omod/src/main/java/org/openmrs/module/appointments/web/mapper/AppointmentMapper.java
@@ -288,8 +288,8 @@ private Map createPatientMap(Patient p) {
     }
 
     private static Map<String, String> mapAttributeTypes(Patient p) {
-        String customPersonAttributeTypes = Context.getAdministrationService().getGlobalProperty("appointments.personAttributeTypes");
-        String[] attributeTypes = customPersonAttributeTypes.split(",");
+        String customPersonAttributeTypes = Context.getAdministrationService().getGlobalProperty("appointments.customPersonAttributeTypes");
+        String[] attributeTypes = customPersonAttributeTypes != null ? customPersonAttributeTypes.split(",") : new String[0];
         Map<String, String> customAttributesMap = new HashMap<>();
         for (String attributeType : attributeTypes) {
             if (p.getAttribute(attributeType) != null) {

diff --git a/omod/src/test/java/org/openmrs/module/appointments/web/mapper/AppointmentMapperTest.java b/omod/src/test/java/org/openmrs/module/appointments/web/mapper/AppointmentMapperTest.java
@@ -107,7 +107,7 @@ public class AppointmentMapperTest {
     private Provider provider;
     private Location location;
 
-    private static final String PERSON_ATTRIBUTE_TYPE_GLOBAL_PROPERTY = "appointments.personAttributeTypes";
+    private static final String PERSON_ATTRIBUTE_TYPE_GLOBAL_PROPERTY = "appointments.customPersonAttributeTypes";
 
     private static final String PERSON_ATTRIBUTE_TYPE_GLOBAL_PROPERTY_VALUES = "attributeA,attributeB,attributeC,attributeD";