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 
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:18:05 +00:00
parent 1ea3931e33
commit 124f05593e
221 changed files with 21 additions and 28579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java
View File

@@ -222,11 +222,7 @@ public abstract class AbstractItemSelector extends UIInput
NodeRef nodeRef = new NodeRef(Repository.getStoreRef(), selection);
if (!getNodeService(context).exists(nodeRef))
{
// // WCM
// nodeRef = new NodeRef(new StoreRef(StoreRef.PROTOCOL_AVM, avmStore), selection);
// Pair<Integer, String> versionPathPair = AVMNodeConverter.ToAVMVersionPath(nodeRef);
// ((EditableValueHolder)this).setSubmittedValue(AVMNodeConverter.ToNodeRef(versionPathPair.getFirst(), versionPathPair.getSecond()));
throw new RuntimeException("WCM anticipation here.");
throw new RuntimeException("NodeRef not found.");
}
else
{
@@ -370,39 +366,7 @@ public abstract class AbstractItemSelector extends UIInput
}
else
{
// WCM
// if (value.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
// {
// Pair<Integer, String> avmNode = AVMNodeConverter.ToAVMVersionPath(value);
// String avmPath = avmNode.getSecond();
//
// int rootPosition = avmPath.indexOf(AVMUtil.DIR_ROOT);
// if(rootPosition > 0)
// {
// label = avmPath.substring(rootPosition + AVMUtil.DIR_ROOT.length());
// if(label.length() == 0)
// {
// int storeEnd = avmPath.indexOf(":");
// if(storeEnd > 0)
// {
// label = avmPath.substring(0, storeEnd);
// }
// else
// {
// label = "ROOT";
// }
// }
// }
// else
// {
// // AVM path does not have ROOT
// label = avmPath;
// }
// }
// else
// {
label = Repository.getNameForNode(service, value);
// }
label = Repository.getNameForNode(service, value);
showValueInHiddenField = true;
}
@@ -436,13 +400,6 @@ public abstract class AbstractItemSelector extends UIInput
if (value != null)
{
fieldValue = encodeFieldValues(theMode, value.getId());
//
// // WCM
// // setup the avmStore if the value represents an avm path
// if (value.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
// {
// this.avmStore = value.getStoreRef().getIdentifier();
// }
}
else
{