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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78414: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75784: ACE-2149: EOL AVM / WCM
       - Get 'web-client' project to compile
       - For further work, all bits that required commenting or changing were tagged with '// WCM'
         i.e. a search for 'WCM' will highlight all the code changes made
       - TODO: Visit jsp files and other config to do a proper job


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:08:20 +00:00
parent 5cf4251421
commit 34d911b025
35 changed files with 1176 additions and 3862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
View File

@@ -330,15 +330,16 @@ public class ClipboardBean implements Serializable
{
item = new WorkspaceClipboardItem(ref, parent, mode, customPasteViewIds);
}
else if (StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()))
{
item = new AVMClipboardItem(ref, mode, customPasteViewIds);
}
else
{
logger.warn("Unable to add item to clipboard - unknown store protocol: " + ref.getStoreRef().getProtocol());
}
// // WCM
// else if (StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()))
// {
// item = new AVMClipboardItem(ref, mode, customPasteViewIds);
// }
// else
// {
// logger.warn("Unable to add item to clipboard - unknown store protocol: " + ref.getStoreRef().getProtocol());
// }
//
if (item != null)
{
// check for duplicates first
@@ -363,7 +364,9 @@ public class ClipboardBean implements Serializable
FacesContext context = FacesContext.getCurrentInstance();
if (Application.getClientConfig(context).isClipboardStatusVisible())
{
String pattern = Application.getMessage(context, StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()) ? "node_added_clipboard_avm" : "node_added_clipboard");
// // WCM
// String pattern = Application.getMessage(context, StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()) ? "node_added_clipboard_avm" : "node_added_clipboard");
String pattern = Application.getMessage(context, "node_added_clipboard");
String msg = MessageFormat.format(pattern, items.size());
FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_INFO, msg, msg);
context.addMessage(null, facesMsg);