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

BugFixes: Filter wurden nicht übernommen, NPE wenn keine ShortDescription vorhanden war 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1297 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-11-25 13:23:51 +00:00
parent 74cdc4d15f
commit 3cc4bdba14
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,20 +100,16 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
final Element filtersElem = depProjectsElem.newChildElement( final Element filtersElem = depProjectsElem.newChildElement(
"filters"); "filters");
statusFilter.generateXml(filtersElem);
if (((request.getParameter(STATUS_PARAM) == null) if (((request.getParameter(STATUS_PARAM) == null)
|| (request.getParameter(STATUS_PARAM).trim().isEmpty()) || (request.getParameter(STATUS_PARAM).trim().isEmpty()))
|| (statusFilter.getFilter() == null)
|| (statusFilter.getFilter().trim().isEmpty()))
&& ((request.getParameter(TITLE_PARAM) == null) && ((request.getParameter(TITLE_PARAM) == null)
|| request.getParameter(TITLE_PARAM).trim().isEmpty()) || request.getParameter(TITLE_PARAM).trim().isEmpty())) {
|| (titleFilter.getFilter() == null)
|| !(titleFilter.getFilter().trim().isEmpty())) { statusFilter.generateXml(filtersElem);
depProjectsElem.newChildElement("greeting"); depProjectsElem.newChildElement("greeting");
projects.addOrder("projectBegin"); projects.addOrder("projectBegin desc");
projects.addOrder("title"); projects.addOrder("title");
projects.setRange(1, config.getGreetingSize() + 1); projects.setRange(1, config.getGreetingSize() + 1);
@ -123,10 +119,11 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
} else { } else {
projects.addOrder("title"); projects.addOrder("title");
applyStatusFilter(projects, request); applyStatusFilter(projects, request);
applyTitleFilter(projects, request); applyTitleFilter(projects, request);
statusFilter.generateXml(filtersElem);
final Paginator paginator = new Paginator(request, final Paginator paginator = new Paginator(request,
(int) projects.size(), (int) projects.size(),
config.getPageSize()); config.getPageSize());
@ -138,7 +135,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
paginator.applyLimits(projects); paginator.applyLimits(projects);
paginator.generateXml(depProjectsElem); paginator.generateXml(depProjectsElem);
} }
while (projects.next()) { while (projects.next()) {
generateProjectXml((BigDecimal) projects.get("projectId"), generateProjectXml((BigDecimal) projects.get("projectId"),
depProjectsElem, depProjectsElem,
@ -251,7 +248,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
final XmlGenerator generator = new XmlGenerator(project); final XmlGenerator generator = new XmlGenerator(project);
generator.setItemElemName("project", ""); generator.setItemElemName("project", "");
generator.setUseExtraXml(false); generator.setUseExtraXml(false);
generator.generateXML(state, parent, ""); generator.generateXML(state, parent, "");
logger.debug(String.format("Generated XML for project '%s' in %d ms.", logger.debug(String.format("Generated XML for project '%s' in %d ms.",
project.getName(), project.getName(),
System.currentTimeMillis() - start)); System.currentTimeMillis() - start));

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

@ -99,21 +99,19 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
"instituteProjects"); "instituteProjects");
final Element filtersElem = depProjectsElem.newChildElement( final Element filtersElem = depProjectsElem.newChildElement(
"filters"); "filters");
statusFilter.generateXml(filtersElem);
if (((request.getParameter(STATUS_PARAM) == null) if (((request.getParameter(STATUS_PARAM) == null)
|| (request.getParameter(STATUS_PARAM).trim().isEmpty()) || (request.getParameter(STATUS_PARAM).trim().isEmpty())
|| (statusFilter.getFilter() == null) )
|| (statusFilter.getFilter().trim().isEmpty()))
&& ((request.getParameter(TITLE_PARAM) == null) && ((request.getParameter(TITLE_PARAM) == null)
|| request.getParameter(TITLE_PARAM).trim().isEmpty()) || request.getParameter(TITLE_PARAM).trim().isEmpty()
|| (titleFilter.getFilter() == null) )) {
|| !(titleFilter.getFilter().trim().isEmpty())) {
statusFilter.generateXml(filtersElem);
depProjectsElem.newChildElement("greeting"); depProjectsElem.newChildElement("greeting");
projects.addOrder("projectBegin"); projects.addOrder("projectBegin desc");
projects.addOrder("title"); projects.addOrder("title");
projects.setRange(1, config.getGreetingSize() + 1); projects.setRange(1, config.getGreetingSize() + 1);
@ -127,6 +125,8 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
applyStatusFilter(projects, request); applyStatusFilter(projects, request);
applyTitleFilter(projects, request); applyTitleFilter(projects, request);
statusFilter.generateXml(filtersElem);
final Paginator paginator = new Paginator(request, final Paginator paginator = new Paginator(request,
(int) projects.size(), (int) projects.size(),
config.getPageSize()); config.getPageSize());
@ -188,7 +188,7 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
} }
} else { } else {
/*projectsFilter.append(String.format("orgaunitId = %s", /*projectsFilter.append(String.format("orgaunitId = %s",
orgaunit.getID().toString()));*/ orgaunit.getID().toString()));*/
orgaunitIds.add(orgaunit.getID().toString()); orgaunitIds.add(orgaunit.getID().toString());
} }

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

@ -54,6 +54,8 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab {
if (config.isShowingHead()) { if (config.isShowingHead()) {
generateHeadOfInstituteXml(institute, instituteSummaryElem, state); generateHeadOfInstituteXml(institute, instituteSummaryElem, state);
} }
generateDepartmentsXml(institute, instituteSummaryElem, state);
logger.debug(String.format("Generated XML for summary tab of institute " logger.debug(String.format("Generated XML for summary tab of institute "
+ "'%s' in %d ms.", + "'%s' in %d ms.",