mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged 5.2.N (5.2.2) to HEAD (5.2)
137126 jvonka: CLD-79 - Minor update to Cloud Admin Node Browser to show "Source Associations" - TODO merge to 5.2.N-CLOUD44 & additional change on CLOUD44 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -107,6 +107,7 @@ public class AdminNodeBrowseBean implements Serializable
|
|||||||
transient private DataModel properties = null;
|
transient private DataModel properties = null;
|
||||||
transient private DataModel children = null;
|
transient private DataModel children = null;
|
||||||
transient private DataModel assocs = null;
|
transient private DataModel assocs = null;
|
||||||
|
transient private DataModel sourceAssocs = null;
|
||||||
transient private DataModel permissions = null;
|
transient private DataModel permissions = null;
|
||||||
transient private DataModel permissionMasks = null;
|
transient private DataModel permissionMasks = null;
|
||||||
|
|
||||||
@@ -454,6 +455,28 @@ public class AdminNodeBrowseBean implements Serializable
|
|||||||
return assocs;
|
return assocs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the current source associations
|
||||||
|
*
|
||||||
|
* @return associations
|
||||||
|
*/
|
||||||
|
public DataModel getSourceAssocs()
|
||||||
|
{
|
||||||
|
if (sourceAssocs == null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
List<AssociationRef> assocRefs = getNodeService().getSourceAssocs(getNodeRef(), RegexQNamePattern.MATCH_ALL);
|
||||||
|
sourceAssocs = new ListDataModel(assocRefs);
|
||||||
|
}
|
||||||
|
catch (UnsupportedOperationException err)
|
||||||
|
{
|
||||||
|
// some stores do not support associations
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sourceAssocs;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the current query language
|
* Gets the current query language
|
||||||
*
|
*
|
||||||
@@ -588,6 +611,19 @@ public class AdminNodeBrowseBean implements Serializable
|
|||||||
return "success";
|
return "success";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Action to select association From node
|
||||||
|
*
|
||||||
|
* @return next action
|
||||||
|
*/
|
||||||
|
public String selectFromNode()
|
||||||
|
{
|
||||||
|
AssociationRef assocRef = (AssociationRef) getSourceAssocs().getRowData();
|
||||||
|
NodeRef sourceRef = assocRef.getSourceRef();
|
||||||
|
setNodeRef(sourceRef);
|
||||||
|
return "success";
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Action to select node property
|
* Action to select node property
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user