From f8d9800b7bf000dffa2dc0539f4d8b9a7a3b1c3a Mon Sep 17 00:00:00 2001 From: Jalinson Diaz Date: Tue, 20 Aug 2024 17:51:19 -0300 Subject: [PATCH 1/2] revert --- .../ext/contentlet/edit_contentlet_js_inc.jsp | 5 ----- .../ext/contentlet/field/edit_field.jsp | 21 +++++-------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp index 03070448d4e6..457c03623601 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp @@ -731,11 +731,6 @@ customEvent.initCustomEvent('ng-event', false, false, customEventDetail); document.dispatchEvent(customEvent); - const binaryCallbacks = Object.keys(window.binaryFieldCallbacksMap || {}).map(key => window.binaryFieldCallbacksMap[key]); // Get the callbacks in an array - - binaryCallbacks.forEach(callback => { - callback(); // To reload all binary fields - }); } function refreshPermissionsTab(){ diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp index 9b89e4af6144..74ac3e92a89f 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp @@ -62,8 +62,6 @@ Object inodeObj =(Object) request.getAttribute("inode"); String inode = inodeObj != null ? inodeObj.toString() : ""; - String contentletIdentifier = contentlet.getIdentifier(); - String counter = (String) request.getAttribute("counter"); boolean fullScreenField = Try.of(()->(boolean)request.getAttribute("DOT_FULL_SCREEN_FIELD")).getOrElse(false); @@ -115,6 +113,7 @@ } } +
<% if (hint != null) {%> @@ -213,6 +212,7 @@ String textValue = UtilMethods.isSet(value) ? value.toString(): (UtilMethods.isSet(defaultValue) ? defaultValue : ""); String safeTextValue = "`" + StringEscapeUtils.escapeJavaScript(textValue.replaceAll("`", "`").replaceAll("\\$", "$")) + "`"; + String contentletIdentifier = contentlet.getIdentifier(); String jsonField = "{}"; String contentletObj = "{}"; Boolean showVideoThumbnail = Config.getBooleanProperty("SHOW_VIDEO_THUMBNAIL", true); @@ -774,7 +774,7 @@ <%}else{%> From 629dabce2ed65001204acf8578ecdc05cd92e8fd Mon Sep 17 00:00:00 2001 From: Jalinson Diaz Date: Tue, 20 Aug 2024 17:52:58 -0300 Subject: [PATCH 2/2] Update edit_contentlet.jsp --- .../main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp | 2 -- 1 file changed, 2 deletions(-) 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 index 8fc2678cd17f..aabb03f620fb 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp @@ -108,8 +108,6 @@ <% } %>