Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#13384 - Delete Template dependencies popup should display Template T… #13455

Merged
merged 1 commit into from
Jan 19, 2018
Merged

#13384 - Delete Template dependencies popup should display Template T… #13455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dotCMS/src/main/webapp/html/portlet/ext/folders/context_menus_js.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 + '">';
Expand Down Expand Up @@ -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>';
}
Expand Down
11 changes: 7 additions & 4 deletions dotCMS/src/main/webapp/html/portlet/ext/templates/view_templates.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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>";
}
Expand Down Expand Up @@ -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>
Expand Down