SHIBUI-1788

Bug fix for list items in the relying party config screen
TIER · Jun 16, 2021 · 770cdc6 · 770cdc6
1 parent 222a3db
commit 770cdc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
@@ -77,7 +77,7 @@ public Set<String> getDefaultValues() {
     @Override
     public String getDisplayName() {
         // This is here only to ensure proper functionality works until the full definition is revised with all the fields
-        return displayName == null ? "DEFAULTED to name: " + name : displayName;
+        return displayName == null ? name : displayName;
     }
 
     @Override

diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
@@ -650,12 +650,16 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope
                         Object attributeValues = null;
                         switch (ModelRepresentationConversions.AttributeTypes.valueOf(overrideProperty.getDisplayType().toUpperCase())) {
                             case STRING:
+                            case DOUBLE:
+                            case DURATION:
+                            case SPRING_BEAN_ID:
                                 if (jpaAttribute.getAttributeValues().size() != 1) {
                                     throw new RuntimeException("Multiple/No values detected where one is expected!");
                                 }
                                 attributeValues = getValueFromXMLObject(jpaAttribute.getAttributeValues().get(0));
                                 break;
                             case INTEGER:
+                            case LONG:
                                 if (jpaAttribute.getAttributeValues().size() != 1) {
                                     throw new RuntimeException("Multiple/No values detected where one is expected!");
                                 }
@@ -675,6 +679,7 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope
                                 break;
                             case SET:
                             case LIST:
+                            case SELECTION_LIST:
                                 attributeValues = jpaAttribute.getAttributeValues().stream()
                                         .map(attributeValue -> getValueFromXMLObject(attributeValue))
                                         .collect(Collectors.toList());