fix(edit-content): Navigation is broken for new Content in Content Se…

…arch #26440 * fix (view contentlet jsp): enhance reference of current content type * clean up
dotCMS · Nov 7, 2023 · ba60e73 · ba60e73
1 parent 56d7271
commit ba60e73
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets.jsp
@@ -59,7 +59,6 @@
 
     String structureSelected = null;
     final String variableName = (String) request.getParameter("filter");
-    String velocityVarName = null;
 
     if(UtilMethods.isSet(variableName)){
         if (com.dotmarketing.beans.Host.HOST_VELOCITY_VAR_NAME.equals(variableName)){
@@ -68,7 +67,7 @@
             try {
                 ContentType filterContentType = APILocator.getContentTypeAPI(user).find(variableName);
                 structureSelected = filterContentType != null ? filterContentType.id() : null;
-                velocityVarName = filterContentType.variable();
+
             } catch (NotFoundInDbException e) {
                 structureSelected = null;
             }
@@ -79,7 +78,6 @@
             try {
                 ContentType contentType = APILocator.getContentTypeAPI(user).find(structureSelected);
 
-                velocityVarName = contentType.variable();
 
                 if (contentType != null && com.dotmarketing.beans.Host.HOST_VELOCITY_VAR_NAME.equals(contentType.variable()) ){
                     structureSelected = null;
@@ -572,7 +570,7 @@
             label: "<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "Add-New-Content" )) %>",
             iconClass: "plusIcon",
             onClick: function() {
-                addNewContentlet(null, "<%= velocityVarName %>");
+                addNewContentlet(null);
             }
         });
         menu.addChild(menuItem1);
@@ -781,7 +779,7 @@
                                         }
                                     </script>
                                     <ul data-dojo-type="dijit/Menu" id="actionPrimaryMenu" style="display: none;">
-                                        <li data-dojo-type="dijit/MenuItem" data-dojo-props="onClick:function() {addNewContentlet('', '<%= velocityVarName %>')}"><%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "Add-New-Content" )) %></li>
+                                        <li data-dojo-type="dijit/MenuItem" data-dojo-props="onClick:function() {addNewContentlet('')}"><%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "Add-New-Content" )) %></li>
                                         <li data-dojo-type="dijit/MenuItem" data-dojo-props="onClick:importContent">
                                             <%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "Import-Content" )) %>
                                         </li>

diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp
@@ -831,10 +831,13 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
 		function updateSelectedStructAux(){
 			structureInode = dijit.byId('selectedStructAux').value;
 			addNewContentlet(structureInode);
+
+
 		}
 
         function dispatchCreateContentletEvent(url, contentType) {
             var customEvent = document.createEvent("CustomEvent");
+
             customEvent.initCustomEvent("ng-event", false, false,  {
                 name: "create-contentlet",
                 data: {
@@ -849,12 +852,30 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
 
 
         function addNewContentlet(structureInode, contentType){
-			if(structureInode == undefined || structureInode==""){
-                        // This gets the catchall and opens the dialog to select a contentType, and also retrieves the content type when is a custom portlet
+
+                if(!contentType){
+
+                        // This is the same way they get the current var name on downloadToExcel method
+
+                        let structureVelraw = dojo.byId("structureVelocityVarNames").value;
+
+                        let structInoderaw = dojo.byId("structureInodesList").value;
+
+                        let structureVelArray = structureVelraw.split(";");
+
+                        let structureInodeArray = structInoderaw.split(";");
+
+                        let contentTypeInode = dijit.byId('structure_inode').value;
+
+                        contentType = structureVelArray.find((varName, i) => structureInodeArray[i] === contentTypeInode)
+                }
+
+		if(structureInode == undefined || structureInode==""){
+                                // This gets the catchall and opens the dialog to select a contentType, and also retrieves the content type when is a custom portlet
         		structureInode = dijit.byId('structure_inode').value;
         	}
 			if(structureInode == undefined || structureInode=="" || structureInode == "catchall"){
-				dijit.byId("selectStructureDiv").show();
+                                dijit.byId("selectStructureDiv").show();
 				return;
 			}
           else if(structureInode == '<%=calendarEventInode %>'){