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 up to HEAD.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-06-16 19:18:30 +00:00
parent 77df6eb45d
commit d2f8666983
39 changed files with 2129 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/web/ui/common/component/data/UIRichList.java
View File

@@ -409,7 +409,7 @@ public class UIRichList extends UIComponentBase implements IDataContainer
int rowCount = getDataModel().size();
// if a page size is specified, then we use that
int pageSize = getPageSize();
if (pageSize != -1)
if (pageSize != -1 && pageSize != 0)
{
// calc start row index based on current page index
this.rowIndex = (this.currentPage * pageSize) - 1;

3
source/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java
View File

@@ -219,6 +219,7 @@ public class NodePathLinkRenderer extends BaseRenderer
NodeRef lastElementRef = null;
int size = (showLeaf ? path.size() : path.size() - 1);
int lastElementPos = (showLeaf ? path.size() - 1 : path.size() - 2);
for (int i=0; i<size; i++)
{
Path.Element element = path.get(i);
@@ -230,7 +231,7 @@ public class NodePathLinkRenderer extends BaseRenderer
{
elementString = Repository.getNameForNode(getNodeService(context), elementRef.getChildRef());
}
if (i == path.size() - 2)
if (i == lastElementPos)
{
lastElementRef = elementRef.getChildRef();
}