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

Verschiedene Ergänzungen. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1311 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-12-01 15:28:12 +00:00
parent b52d0a3c96
commit 4ea7b71896
2 changed files with 118 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java
View File

@ -19,6 +19,7 @@ import com.arsdigita.xml.Element;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@ -111,6 +112,10 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
projects.addOrder("projectEnd desc");
projects.addOrder("projectBegin desc");
//projects.addOrder("projectEnd desc nulls last");
//projects.addOrder("projectBegin desc nulls last");
//projects.addOrderWithNull("projectEnd", new Date(0), false);
//projects.addOrderWithNull("projectBegin", new Date(0), false);
projects.addOrder("title");
projects.setRange(1, config.getGreetingSize() + 1);
@ -129,6 +134,8 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
titleFilter.generateXml(filtersElem);
depProjectsElem.newChildElement("noProjects");
return;
} else {
final Paginator paginator = new Paginator(request,
(int) projects.size(),
@ -143,13 +150,13 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
paginator.applyLimits(projects);
paginator.generateXml(depProjectsElem);
}
}
while (projects.next()) {
generateProjectXml((BigDecimal) projects.get("projectId"),
depProjectsElem,
state);
}
}
logger.debug(String.format("Generated projects list of department '%s' "
+ "in %d ms.",
@ -240,8 +247,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
final Element parent,
final PageState state) {
final long start = System.currentTimeMillis();
final ContentPage project = (ContentPage) DomainObjectFactory.
newInstance(new OID(
final ContentPage project = (ContentPage) DomainObjectFactory.newInstance(new OID(
"com.arsdigita.cms.contenttypes.SciProject", projectId));
logger.debug(String.format("Got domain object for project '%s' "
+ "in %d ms.",

12
ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java
View File

@ -19,6 +19,7 @@ import com.arsdigita.xml.Element;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@ -111,6 +112,10 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
projects.addOrder("projectEnd desc");
projects.addOrder("projectBegin desc");
//projects.addOrder("projectEnd desc nulls last");
//projects.addOrder("projectBegin desc nulls last");
//projects.addOrderWithNull("projectEnd", null, false);
//projects.addOrderWithNull("projectBegin", null, false);
projects.addOrder("title");
projects.setRange(1, config.getGreetingSize() + 1);
@ -129,6 +134,8 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
titleFilter.generateXml(filtersElem);
depProjectsElem.newChildElement("noProjects");
return;
} else {
final Paginator paginator = new Paginator(request,
(int) projects.size(),
@ -143,13 +150,13 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
paginator.applyLimits(projects);
paginator.generateXml(depProjectsElem);
}
}
while (projects.next()) {
generateProjectXml((BigDecimal) projects.get("projectId"),
depProjectsElem,
state);
}
}
logger.debug(String.format("Generated projects list of department '%s' "
+ "in %d ms.",
@ -240,8 +247,7 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
final Element parent,
final PageState state) {
final long start = System.currentTimeMillis();
final ContentPage project = (ContentPage) DomainObjectFactory.
newInstance(new OID(
final ContentPage project = (ContentPage) DomainObjectFactory.newInstance(new OID(
"com.arsdigita.cms.contenttypes.SciProject", projectId));
logger.debug(String.format("Got domain object for project '%s' "
+ "in %d ms.",