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 exception thrown when clicking Details of a file/folder Link object.

Browse Source 
Fix to query so that OpenSearch People search finds some useful results and doesn't potentially throw exception when certain characters are passed to the query - ETWONINE-7.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-10-08 12:10:30 +00:00
parent 0c66da37c5
commit e56a24a351
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
View File

@@ -56,11 +56,12 @@ public class LinkPropertiesDialog extends BaseDialogBean
{ {
private static final long serialVersionUID = -167326851073011187L; private static final long serialVersionUID = -167326851073011187L;
private Node editableNode; private Node editableNode = null;
public Map<String, Object> getProperties() public Map<String, Object> getProperties()
{ {
return this.editableNode.getProperties(); return getEditableNode().getProperties();
} }
@Override @Override
@@ -76,6 +77,17 @@ public class LinkPropertiesDialog extends BaseDialogBean
*/ */
public Node getEditableNode() public Node getEditableNode()
{ {
if (this.editableNode == null)
{
if (this.parameters.containsKey("nodeRef"))
{
this.editableNode = new Node(new NodeRef(this.parameters.get("nodeRef")));
}
else
{
throw new IllegalArgumentException("Dialog has not been initialised with noderef or setup action event called.");
}
}
return this.editableNode; return this.editableNode;
} }
@@ -104,7 +116,7 @@ public class LinkPropertiesDialog extends BaseDialogBean
*/ */
public String getDestinationPath() public String getDestinationPath()
{ {
NodeRef destRef = (NodeRef)this.editableNode.getProperties().get(ContentModel.PROP_LINK_DESTINATION); NodeRef destRef = (NodeRef)getEditableNode().getProperties().get(ContentModel.PROP_LINK_DESTINATION);
return Repository.getNamePath( return Repository.getNamePath(
this.getNodeService(), this.getNodeService().getPath(destRef), null, "/", null); this.getNodeService(), this.getNodeService().getPath(destRef), null, "/", null);
} }
@@ -136,8 +148,8 @@ public class LinkPropertiesDialog extends BaseDialogBean
{ {
try try
{ {
NodeRef nodeRef = this.editableNode.getNodeRef(); NodeRef nodeRef = getEditableNode().getNodeRef();
Map<String, Object> props = this.editableNode.getProperties(); Map<String, Object> props = getEditableNode().getProperties();
Map<QName, Serializable> properties = this.getNodeService().getProperties(nodeRef); Map<QName, Serializable> properties = this.getNodeService().getProperties(nodeRef);