#28780 include in 24.04.24 LTS

dotCMS · Dec 4, 2024 · 9a452a3 · 9a452a3
1 parent 49315ab
commit 9a452a3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -89,3 +89,4 @@ This maintenance release includes the following code fixes:
 83. https://github.com/dotCMS/core/issues/30724 : Task URL redirecting only to language_id=1 #30724
 84. https://github.com/dotCMS/core/issues/28511 : Rename Title Column #28511
 85. https://github.com/dotCMS/core/issues/28512 : Rename Date Updated Column #28512
+86. https://github.com/dotCMS/core/issues/28780 : Add Hint support for relationship fields #28780
diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/model/field/RelationshipField.java b/dotCMS/src/main/java/com/dotcms/contenttype/model/field/RelationshipField.java
@@ -53,6 +53,6 @@ public abstract static class Builder implements RelationshipFieldBuilder {
     @JsonIgnore
     public Collection<ContentTypeFieldProperties> getFieldContentTypeProperties(){
         return list(ContentTypeFieldProperties.REQUIRED, ContentTypeFieldProperties.NAME,
-                ContentTypeFieldProperties.RELATIONSHIPS, ContentTypeFieldProperties.SEARCHABLE);
+                ContentTypeFieldProperties.RELATIONSHIPS, ContentTypeFieldProperties.HINT, ContentTypeFieldProperties.SEARCHABLE);
     }
 }
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp
@@ -74,6 +74,7 @@
 <%@ page import="org.apache.poi.ss.usermodel.Row" %>
 <%@ page import="com.dotcms.contenttype.transform.field.FieldTransformer" %>
 <%@ page import="com.dotmarketing.util.Logger" %>
+<%@ page import="java.util.Optional" %>
 <!DOCTYPE html>
 <script type='text/javascript' src='/dwr/interface/LanguageAjax.js'></script>
 
@@ -442,6 +443,17 @@
                             }%>
 
                             <div class="fieldName">
+								<%
+									String hint = Optional.ofNullable(f.getHint())
+											.filter(UtilMethods::isSet)
+											.orElse(null);
+									if (hint != null) {
+								%>
+								<a href="#" id="tip-<%=f.getVelocityVarName()%>"><span class="hintIcon"></span></a>
+								<span dojoType="dijit.Tooltip" connectId="tip-<%=f.getVelocityVarName()%>" position="above" style="width:100px;">
+									<span class="contentHint"><%=hint%></span>
+									</span>
+								<%}%>
                                 <% if(f.isRequired()) {%>
                                     <label class="required">
                             		<%} else {%>