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 BRANCHES/V3.4 to HEAD:

Browse Source 
24065: Fix for ALF-5064: Overriding the config for a form with an edit-form defined appears to lose knowledge of the custom form
   24471: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_29 to BRANCHES/V3.4:
        24361: ALF-6033: Sharepoint broken on Vista.
   24548: Fix for ALF-6110:Checking out doсument's via MS Office leads to incorrect displaying of document's metadata and for ALF-6113: MP3 files cause an error when viewing the Document Details page
   24601: Fix for ALF-6032: It's impossible to create meeting items

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2011-01-17 15:04:37 +00:00
parent e057f68319
commit 803321fd1c
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -82,6 +82,7 @@ import org.alfresco.service.cmr.version.VersionHistory;
import org.alfresco.service.cmr.version.VersionType;
import org.alfresco.service.cmr.workflow.WorkflowInstance;
import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.namespace.NamespaceException;
import org.alfresco.service.namespace.NamespacePrefixResolver;
import org.alfresco.service.namespace.NamespacePrefixResolverProvider;
import org.alfresco.service.namespace.NamespaceService;
@@ -2809,8 +2810,18 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol
= new LinkedHashMap<String, Serializable>(nodeProperties.size());
for (QName nextLongQName : nodeProperties.keySet())
{
String nextShortQName = getShortQName(nextLongQName);
nodePropertiesShortQNames.put(nextShortQName, nodeProperties.get(nextLongQName));
try
{
String nextShortQName = getShortQName(nextLongQName);
nodePropertiesShortQNames.put(nextShortQName, nodeProperties.get(nextLongQName));
}
catch (NamespaceException ne)
{
// ignore properties that do not have a registered namespace
if (logger.isDebugEnabled())
logger.debug("Ignoring property '" + nextLongQName + "' as it's namespace is not registered");
}
}
json.put("properties", nodePropertiesShortQNames);
}