merging #18104 to 5.2.7

dotCMS · Mar 6, 2020 · 86356dd · 86356dd
1 parent 01dfd9e
commit 86356dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESMappingAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESMappingAPIImpl.java
@@ -60,6 +60,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.liferay.portal.model.User;
 import com.liferay.util.StringPool;
+import io.vavr.control.Try;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -553,7 +554,15 @@ protected void loadFields(final Contentlet contentlet, final Map<String, Object>
 					.append(field.getVelocityVarName());
 			keyName        = keyNameBuilder.toString();
 			keyNameText    = keyNameBuilder.append(TEXT).toString();
-			if (field.getFieldType().equals(Field.FieldType.BINARY.toString()) // todo: remove this since we are going to index the binary fields
+
+			if (field.getFieldType().equals(Field.FieldType.BINARY.toString()) && field.isIndexed()){
+			    String fileName = Try.of(()-> contentlet.getBinary(field.getVelocityVarName()).getName()).getOrElse("_unk");
+                contentletMap.put(keyName, fileName);
+                contentletMap.put(keyNameText, fileName);
+                continue;
+            }
+
+			if (field.getFieldType().equals(Field.FieldType.BINARY.toString())
 					|| field.getFieldContentlet() != null && (field.getFieldContentlet().startsWith(ESMappingConstants.FIELD_TYPE_SYSTEM_FIELD)
 					&& !field.getFieldType().equals(Field.FieldType.TAG.toString()))) {
 

diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/model/type/DotAssetContentType.java b/dotCMS/src/main/java/com/dotcms/contenttype/model/type/DotAssetContentType.java
@@ -56,7 +56,7 @@ public  List<Field> requiredFields(){
 
 		fields.add(
 				ImmutableBinaryField.builder()
-				.name("Binary Asset")
+				.name("Asset")
 				.variable(ASSET_FIELD_VAR)
 				.sortOrder(fields.size())
 				.fixed(true)