fix MID-5232 Internal error 500 by searching in CSV resource

Evolveum · Apr 10, 2019 · f478155 · f478155
1 parent 5ea3f89
commit f478155
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java b/...ain/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
@@ -102,12 +102,7 @@ private <T extends ObjectType> List<SearchItemDefinition> createAttributeDefinit
 	}
 
 	private ItemName getAttributeName(ResourceAttributeDefinition def) {
-		if (def.getNativeAttributeName() != null) {
-			return ItemName.fromQName(new QName(MidPointConstants.NS_RI, def.getNativeAttributeName()));
-		}
-
 		return def.getName();
-
 	}
 
 	@Override

diff --git a/...n/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java b/...n/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
@@ -45,6 +45,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.PropertyAccessType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.PropertyLimitationsType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceAttributeDefinitionType;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -203,6 +204,9 @@ public void setHelp(String help) {
 
     @Override
     public String getDisplayName() {
+        if (displayName == null && attributeDefinition != null && StringUtils.isNotEmpty(attributeDefinition.getNativeAttributeName())){
+            return attributeDefinition.getNativeAttributeName();
+        }
         return displayName;
     }