From a86cdfdee863748be87c15a37bf85e9308b5d4b5 Mon Sep 17 00:00:00 2001
From: gortiz-dotcms <geronimo.ortiz@dotcms.com>
Date: Tue, 23 Jun 2026 16:43:34 -0300
Subject: [PATCH 1/2] fix: open dialog when clicking on content on pending
 bundles (#36250)

---
 .../business/PublishQueueElementTransformer.java  |  2 ++
 .../publishing/view_publish_queue_list.jsp        | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishQueueElementTransformer.java b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishQueueElementTransformer.java
index 31185b5e1eb2..be3e37ca4919 100644
--- a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishQueueElementTransformer.java
+++ b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishQueueElementTransformer.java
@@ -30,6 +30,7 @@ public class PublishQueueElementTransformer {
     public static final String TITLE_KEY = "title";
     public static final String INODE_KEY = "inode";
     public static final String CONTENT_TYPE_NAME_KEY = "content_type_name";
+    public static final String CONTENT_TYPE_VARIABLE_KEY = "content_type_variable";
     public static final String LANGUAGE_CODE_KEY = "language_code";
     public static final String COUNTRY_CODE_KEY = "country_code";
     public static final String OPERATION_KEY = "operation";
@@ -156,6 +157,7 @@ private static Map<String, Object> getMapForContentlet(final String id) {
                         TITLE_KEY, contentlet.getTitle(),
                         INODE_KEY, contentlet.getInode(),
                         CONTENT_TYPE_NAME_KEY, contentlet.getContentType().name(),
+                        CONTENT_TYPE_VARIABLE_KEY, contentlet.getContentType().variable(),
                         HTML_PAGE_KEY, contentlet.isHTMLPage()
                     ) : Map.of(TITLE_KEY, id, INODE_KEY, id));
         } catch (DotSecurityException | DotDataException e) {
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_queue_list.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_queue_list.jsp
index 6918921b0ae2..e8981118e82c 100644
--- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_queue_list.jsp
+++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/publishing/view_publish_queue_list.jsp
@@ -115,6 +115,17 @@
 
 <script type="text/javascript">
 
+	function openContentEditor(inode, contentType) {
+		var customEvent = document.createEvent("CustomEvent");
+		customEvent.initCustomEvent("ng-event", false, false, {
+			name: "edit-contentlet",
+			data: {
+				inode: inode,
+				contentType: contentType
+			}
+		});
+		document.dispatchEvent(customEvent);
+	}
 
 	dojo.require("dijit.Tooltip");
 
@@ -322,8 +333,10 @@
 
 							final Object structureObject = asset.get(PublishQueueElementTransformer.CONTENT_TYPE_NAME_KEY);
 							structureName =  UtilMethods.isSet(structureObject) ? structureObject.toString() : StringPool.BLANK;
+							final Object contentTypeVariableObject = asset.get(PublishQueueElementTransformer.CONTENT_TYPE_VARIABLE_KEY);
+							final String contentTypeVariable = UtilMethods.isSet(contentTypeVariableObject) ? contentTypeVariableObject.toString() : StringPool.BLANK;
                         %>
-						    <a href="/c/portal/layout?p_l_id=<%=layoutId %>&p_p_id=<%=PortletID.CONTENT%>&p_p_action=1&p_p_state=maximized&p_p_mode=view&_<%=PortletID.CONTENT%>_struts_action=/ext/contentlet/edit_contentlet&_<%=PortletID.CONTENT%>_cmd=edit&inode=<%=inode %>&referer=<%=referer %>">
+						    <a href="javascript:void(0)" onclick="openContentEditor('<%=inode%>', '<%=contentTypeVariable%>')">
 						        <%=StringEscapeUtils.escapeHtml(title)%>
                             </a>
 						<% } else {

From b2ae51ae550ff2190eb4bdbbcc180e319468bea7 Mon Sep 17 00:00:00 2001
From: gortiz-dotcms <geronimo.ortiz@dotcms.com>
Date: Tue, 23 Jun 2026 16:54:21 -0300
Subject: [PATCH 2/2] fix(push-publishing): null-guard getContentType() in
 PublishQueueElementTransformer (#33645)

Contentlet.getContentType() returns null when the content type has been deleted. Calling .name() and .variable() on the result directly caused an unhandled NPE that broke the publishing queue UI for every asset in the affected bundle. Cache the result once and guard for null before use.

Refs: #33645
---
 .../business/PublishQueueElementTransformer.java         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishQueueElementTransformer.java b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishQueueElementTransformer.java
index be3e37ca4919..23b2495f7ad3 100644
--- a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishQueueElementTransformer.java
+++ b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishQueueElementTransformer.java
@@ -1,5 +1,6 @@
 package com.dotcms.publisher.business;
 
+import com.dotcms.contenttype.model.type.ContentType;
 import com.dotcms.publisher.util.PusheableAsset;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.exception.DotDataException;
@@ -152,12 +153,16 @@ private static Map<String, Object> getMapForContentlet(final String id) {
             contentlet = PublishAuditUtil.getInstance()
                     .findContentletByIdentifier(id);
 
+            final ContentType contentType = UtilMethods.isSet(contentlet) ? contentlet.getContentType() : null;
+            final String contentTypeName = contentType != null ? contentType.name() : StringPool.BLANK;
+            final String contentTypeVariable = contentType != null ? contentType.variable() : StringPool.BLANK;
+
             return new HashMap<>(UtilMethods.isSet(contentlet) ?
                     Map.of(
                         TITLE_KEY, contentlet.getTitle(),
                         INODE_KEY, contentlet.getInode(),
-                        CONTENT_TYPE_NAME_KEY, contentlet.getContentType().name(),
-                        CONTENT_TYPE_VARIABLE_KEY, contentlet.getContentType().variable(),
+                        CONTENT_TYPE_NAME_KEY, contentTypeName,
+                        CONTENT_TYPE_VARIABLE_KEY, contentTypeVariable,
                         HTML_PAGE_KEY, contentlet.isHTMLPage()
                     ) : Map.of(TITLE_KEY, id, INODE_KEY, id));
         } catch (DotSecurityException | DotDataException e) {