From a5f52a543e494bbb63d0ae5f508e051468bcd11f Mon Sep 17 00:00:00 2001
From: Andre Curione <andre.curione@dotcms.com>
Date: Fri, 19 Jan 2018 13:40:22 -0600
Subject: [PATCH] #13384 - Delete Template dependencies popup should display
 Template Title

---
 .../html/portlet/ext/folders/context_menus_js.jsp     |  4 ++--
 .../html/portlet/ext/templates/view_templates.jsp     | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dotCMS/src/main/webapp/html/portlet/ext/folders/context_menus_js.jsp b/dotCMS/src/main/webapp/html/portlet/ext/folders/context_menus_js.jsp
index ce816583ff71..fa8257fdaf69 100644
--- a/dotCMS/src/main/webapp/html/portlet/ext/folders/context_menus_js.jsp
+++ b/dotCMS/src/main/webapp/html/portlet/ext/folders/context_menus_js.jsp
@@ -279,7 +279,7 @@ function getLinkPopUp(i,ctxPath, objId, objIden, parentId, openNodes, referer,li
 }
 
 // Template Flyout
-function getTemplatePopUp(i,ctxPath, objId, objIden, openNodes, referer,live,working,deleted,locked,read,write,publish,userId,hasLiveVersion) {
+function getTemplatePopUp(i,ctxPath, objId, objIden, openNodes, referer,live,working,deleted,locked,read,write,publish,userId,hasLiveVersion,name) {
 
 	var strHTML = '';
 	strHTML += '<div dojoType="dijit.Menu" class="dotContextMenu" id="popupTr' + i + '" style="display: none;" targetNodeIds="tr' + i + '">';
@@ -340,7 +340,7 @@ function getTemplatePopUp(i,ctxPath, objId, objIden, openNodes, referer,live,wor
 
 		if ((deleted == "1") && (write == "1"))
 		{
-            strHTML += '<div dojoType="dijit.MenuItem" iconClass="deleteIcon" onClick="if(confirm(\'<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "message.template.confirm.delete.template"))%>\')){ delTemplate(\'' +objId+ '\', \'' +referer+ '\', \'' +objIden+ '\'); }">';
+            strHTML += '<div dojoType="dijit.MenuItem" iconClass="deleteIcon" onClick="if(confirm(\'<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "message.template.confirm.delete.template"))%>\')){ delTemplate(\'' +objId+ '\', \'' +referer+ '\', \'' +objIden+ '\', \'' +name+ '\'); }">';
             strHTML += '<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "Delete-Template"))%>';
             strHTML += '</div>';
 		}
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/templates/view_templates.jsp b/dotCMS/src/main/webapp/html/portlet/ext/templates/view_templates.jsp
index 4ceed4e80353..14709dbddb1e 100644
--- a/dotCMS/src/main/webapp/html/portlet/ext/templates/view_templates.jsp
+++ b/dotCMS/src/main/webapp/html/portlet/ext/templates/view_templates.jsp
@@ -132,11 +132,11 @@ function editTemplate(inode){
 	}
 }
 
-function delTemplate(inode, referer, identifier) {
+function delTemplate(inode, referer, identifier, name) {
 
 	var callMetaData = {
 			  callback:handleDepResponse,
-			  arg: inode + '|' + referer + '|' + identifier, // specify an argument to pass to the callback and exceptionHandler
+			  arg: inode + '|' + referer + '|' + identifier + '|' + name, // specify an argument to pass to the callback and exceptionHandler
 			};
 
     TemplateAjax.checkDependencies(inode, callMetaData);
@@ -147,10 +147,11 @@ function handleDepResponse(data, arg1) {
 	var inode = params[0];
 	var referer = params[1];
 	var identifier = params[2];
+	var name = params[3];
 	
 	if(data!=null) {
 		var res = data.split(",");
-		var resultTableStr = '<table class="listingTable" style=\'margin-bottom: 0px\'><thead><tr><th><%=LanguageUtil.get(pageContext, "title")%></th></tr></thead><tbody>';
+		var resultTableStr = '<table class="listingTable" style=\'margin-bottom: 0px\'><thead><tr><th>'+ name +'</th></tr></thead><tbody>';
 		for (i = 0; i < res.length; i++) {
 			resultTableStr = resultTableStr + "<tr><td>" + res[i]+ "</td></tr>";
 		}
@@ -364,7 +365,9 @@ function processDelete(inode, referer) {
 								'<%=permissions.contains(PermissionAPI.PERMISSION_WRITE) ? "1" : "0" %>',
 								'<%=permissions.contains(PermissionAPI.PERMISSION_PUBLISH) ? "1" : "0" %>',
 								'<%=user.getUserId()%>',
-								'<%=template.hasLiveVersion() ? "1" : "0"%>'));
+								'<%=template.hasLiveVersion() ? "1" : "0"%>',
+                                '<%=template.getName().replaceAll("'","&rsquo;")%>'
+							));
 						</script>
 					</td>
 				</tr>