inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for ALF-4499

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2011-10-19 14:20:49 +00:00
parent f9d1cdd279
commit 3c87aad5b8
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
View File

@@ -36,11 +36,13 @@ import javax.faces.event.FacesEvent;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.web.scripts.FileTypeImageUtils;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.web.app.Application;
import org.alfresco.web.app.servlet.DownloadContentServlet;
import org.alfresco.web.bean.clipboard.ClipboardItem;
import org.alfresco.web.bean.clipboard.ClipboardStatus;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.repo.WebResources;
@@ -217,7 +219,7 @@ public class UIClipboardShelfItem extends UIShelfItem
// output as a content download link
out.write("<a href='");
out.write(context.getExternalContext().getRequestContextPath());
out.write(DownloadContentServlet.generateBrowserURL(item.getNodeRef(), item.getName()));
out.write(generateBrowserURL(dd, nodeService, item));
out.write("' target='new'>");
out.write(Utils.cropEncode(item.getName()));
out.write("</a>");
@@ -356,6 +358,32 @@ public class UIClipboardShelfItem extends UIShelfItem
return buf.toString();
}
/**
* Build the browser url for an item, if item represents the link url is generated for
* link destination
*
* @param dd the dictionary service
* @param nodeService the node service
* @param item the item to build browser url for
*
* @return the browser url for provided item
*/
private String generateBrowserURL(DictionaryService dd, NodeService nodeService, ClipboardItem item)
{
Node document = new Node(item.getNodeRef());
if (dd.isSubClass(item.getType(), ContentModel.TYPE_LINK))
{
NodeRef destNodeRef = (NodeRef) nodeService.getProperty(item.getNodeRef(), ContentModel.PROP_LINK_DESTINATION);
if (nodeService.exists(destNodeRef))
{
document = new Node(destNodeRef);
}
}
return DownloadContentServlet.generateBrowserURL(document.getNodeRef(), document.getName());
}
// ------------------------------------------------------------------------------
// Inner classes