mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.1 to HEAD
6515: Fix for AWC-1362 (system error page when clicking on space that doesn't exist in navigator) 6516: Fix for AR-1688 - Vista 6518: Fix for AWC-1479, AWC-1199 and AWC-426 (javascript insertion into forum posts security related fixes) limit to subset of safe tags for posting 6519: Fix AR-1690 Web Scripts url.args is missing even though it's documented in WIKI 6520: Fix for AWC-1271 (component generator config ignored for associations) 6521: Fix AWC-1492 Some included javascript files in template/webscripts use the wrong app context path i.e. /alfresco when the app is called /alfzip 6522: Build fix 6523: - Fix rendering of tasks with no description in office portlets 6524: Added thread pool for index merging (AR-1633, AR-1579) 6525: One more fix for rendering of tasks with no description in office portlets 6527: Renamed axis jar to reflect version number. 6528: WebServices query cache refactoring git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -177,7 +177,8 @@ public class SpaceDetailsBean extends BaseDetailsBean
|
||||
String id = params.get("id");
|
||||
if (id != null && id.length() != 0)
|
||||
{
|
||||
List<Node> nodes = this.browseBean.getNodes();
|
||||
NodeRef currNodeRef = new NodeRef(Repository.getStoreRef(), id);
|
||||
List<Node> nodes = this.browseBean.getParentNodes(currNodeRef);
|
||||
if (nodes.size() > 1)
|
||||
{
|
||||
// perform a linear search - this is slow but stateless
|
||||
@@ -214,7 +215,6 @@ public class SpaceDetailsBean extends BaseDetailsBean
|
||||
// to the default one.
|
||||
if (foundNextItem == false)
|
||||
{
|
||||
NodeRef currNodeRef = new NodeRef(Repository.getStoreRef(), id);
|
||||
Node currNode = new Node(currNodeRef);
|
||||
this.navigator.setupDispatchContext(currNode);
|
||||
}
|
||||
@@ -232,7 +232,8 @@ public class SpaceDetailsBean extends BaseDetailsBean
|
||||
String id = params.get("id");
|
||||
if (id != null && id.length() != 0)
|
||||
{
|
||||
List<Node> nodes = this.browseBean.getNodes();
|
||||
NodeRef currNodeRef = new NodeRef(Repository.getStoreRef(), id);
|
||||
List<Node> nodes = this.browseBean.getParentNodes(currNodeRef);
|
||||
if (nodes.size() > 1)
|
||||
{
|
||||
// see above
|
||||
@@ -266,7 +267,6 @@ public class SpaceDetailsBean extends BaseDetailsBean
|
||||
// to the default one.
|
||||
if (foundPreviousItem == false)
|
||||
{
|
||||
NodeRef currNodeRef = new NodeRef(Repository.getStoreRef(), id);
|
||||
Node currNode = new Node(currNodeRef);
|
||||
this.navigator.setupDispatchContext(currNode);
|
||||
}
|
||||
|
Reference in New Issue
Block a user