LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Weitere Ergänzungen an der Darstellung der persönlichen Publikationen 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1979 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-11-29 09:46:20 +00:00
parent 3fe85a207c
commit 9ee96e8231
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java
View File

@ -6,6 +6,7 @@ import com.arsdigita.web.URL;
import com.arsdigita.web.Web; import com.arsdigita.web.Web;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -98,6 +99,18 @@ public class Paginator {
query.setRange(getBegin(), getEnd() + 1); query.setRange(getBegin(), getEnd() + 1);
} }
public <T> List<T> applyListLimits(final List<T> list, final Class<T> type) {
int begin = getBegin() - 1;
if (begin < 0) {
begin = 0;
}
int end = getEnd() - 1;
if (end >= list.size()) {
end = list.size();
}
return list.subList(begin, end);
}
public int getPageCount() { public int getPageCount() {
return (int) Math.ceil((double) objectCount / (double) pageSize); return (int) Math.ceil((double) objectCount / (double) pageSize);
} }
@ -123,7 +136,7 @@ public class Paginator {
public int getBegin() { public int getBegin() {
if (pageNumber == 1) { if (pageNumber == 1) {
return 0; return 1;
} else { } else {
return ((pageNumber - 1) * pageSize) + 1; return ((pageNumber - 1) * pageSize) + 1;
} }

3
ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublications.java
View File

@ -260,7 +260,8 @@ public class PersonalPublications implements ContentGenerator {
if (withPaginator) { if (withPaginator) {
final Paginator paginator = new Paginator(state.getRequest(), publications.size(), config.getPageSize()); final Paginator paginator = new Paginator(state.getRequest(), publications.size(), config.getPageSize());
publicationList = publicationList.subList(paginator.getBegin(), paginator.getEnd()); //publicationList = publicationList.subList(paginator.getBegin() - 1, paginator.getEnd() - 1);
publicationList = paginator.applyListLimits(publicationList, PublicationBundle.class);
paginator.generateXml(groupElem); paginator.generateXml(groupElem);
} }