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

Fix for ALF-10447 - Share Admin -> NodeBrowser: NPE when trying to access version node (child of version history node)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2011-09-27 13:16:36 +00:00
parent 6d5bef365f
commit e556b1070f
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.desc.xml
View File

@@ -1,9 +1,10 @@
<webscript> <webscript>
<shortname>Node Browser Repository support</shortname> <shortname>Node Browser Repository support</shortname>
<description>Execute searches, return information on a node and return a list of stores</description> <description>Execute searches, return information on a node or return a list of stores</description>
<url>/slingshot/node/{protocol}/{store}/{id}</url> <url>/slingshot/node/{protocol}/{store}/{id}</url>
<url>/slingshot/node/search</url> <url>/slingshot/node/search</url>
<url>/slingshot/node/stores</url> <url>/slingshot/node/stores</url>
<format default="json">argument</format> <format default="json">argument</format>
<authentication>admin</authentication> <authentication>admin</authentication>
<transaction allow="readonly">required</transaction>
</webscript> </webscript>

6
config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.json.ftl
View File

@@ -38,7 +38,7 @@
"values": [ "values": [
<#list p.values as val> <#list p.values as val>
{ {
"dataType": "${val.dataType}", "dataType": "${val.dataType!""}",
"value": <@printPropertyValue val />, "value": <@printPropertyValue val />,
"isContent": ${val.content?string}, "isContent": ${val.content?string},
"isNodeRef": ${val.nodeRef?string}, "isNodeRef": ${val.nodeRef?string},
@@ -47,8 +47,8 @@
</#list> </#list>
], ],
"type": { "type": {
"name": "${p.typeName.name}", "name": "<#if p.typeName??>${p.typeName.name}</#if>",
"prefixedName": "${p.typeName.prefixedName}" "prefixedName": "<#if p.typeName??>${p.typeName.prefixedName}</#if>"
}, },
"multiple": ${p.collection?string}, "multiple": ${p.collection?string},
"residual": ${p.residual?string} "residual": ${p.residual?string}

6
source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
View File

@@ -991,7 +991,11 @@ public class NodeBrowserScript extends DeclarativeWebScript
*/ */
public String getDataType() public String getDataType()
{ {
String datatype = Property.this.getTypeName().getName(); String datatype = null;
if (Property.this.getTypeName() != null)
{
datatype = Property.this.getTypeName().getName();
}
if (datatype == null || datatype.equals(DataTypeDefinition.ANY.toString())) if (datatype == null || datatype.equals(DataTypeDefinition.ANY.toString()))
{ {
if (value != null) if (value != null)