From 1f6488cd8c9a527144215404414751f0f54d9af3 Mon Sep 17 00:00:00 2001 From: jensp Date: Mon, 28 Nov 2011 16:37:20 +0000 Subject: [PATCH] =?UTF-8?q?-=20Anlegen=20einer=20Sprachvariante=20beim=20M?= =?UTF-8?q?PA=20funktioniert=20jetzt=20wieder=20-=20Verschiedene=20weitere?= =?UTF-8?q?=20BugFixex=20(NPE=20unter=20bestimmten=20Umst=C3=A4nden=20etc)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1302 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/cms/LanguageAwareObjectCopier.java | 7 ++++--- .../publicpersonalprofile/PersonalProjects.java | 3 ++- .../ui/SciInstitutePublicationsTab.java | 15 ++++++++------- .../contenttypes/ui/SciInstituteSummaryTab.java | 1 + 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/LanguageAwareObjectCopier.java b/ccm-cms/src/com/arsdigita/cms/LanguageAwareObjectCopier.java index 924941b20..6f9cb0be3 100644 --- a/ccm-cms/src/com/arsdigita/cms/LanguageAwareObjectCopier.java +++ b/ccm-cms/src/com/arsdigita/cms/LanguageAwareObjectCopier.java @@ -45,9 +45,10 @@ public class LanguageAwareObjectCopier extends ObjectCopier { m_traversed.add(selem, reverse); DomainObject telem = copy(source, target, selem, prop); - if (telem instanceof ContentPage) { - ContentPage tpage = (ContentPage) telem; - telem = tpage.getContentBundle().getInstance(language); + if ((telem instanceof ContentPage) + && ((ContentPage) telem).getContentBundle() != null) { + telem = ((ContentPage) telem).getContentBundle().getInstance( + language); } DataObject tgtLink = null; diff --git a/ccm-sci-personalprojects/src/com/arsdigita/cms/publicpersonalprofile/PersonalProjects.java b/ccm-sci-personalprojects/src/com/arsdigita/cms/publicpersonalprofile/PersonalProjects.java index dc1716536..711deff09 100644 --- a/ccm-sci-personalprojects/src/com/arsdigita/cms/publicpersonalprofile/PersonalProjects.java +++ b/ccm-sci-personalprojects/src/com/arsdigita/cms/publicpersonalprofile/PersonalProjects.java @@ -120,7 +120,8 @@ public class PersonalProjects implements ContentGenerator { final Calendar today = new GregorianCalendar(); final Date todayDate = today.getTime(); for (SciProject project : projects) { - if (project.getEnd().before(todayDate)) { + if ((project.getEnd() != null) + && project.getEnd().before(todayDate)) { finishedProjects.add(project); } else { currentProjects.add(project); diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePublicationsTab.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePublicationsTab.java index f75d1f482..1a4d528a4 100644 --- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePublicationsTab.java +++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePublicationsTab.java @@ -131,7 +131,9 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab { "objectType = 'com.arsdigita.cms.contenttypes.WorkingPaper'"); } - if (((yearValue == null) || yearValue.trim().isEmpty()) + if (((yearValue == null) + || yearValue.trim().isEmpty() + || SelectFilter.NONE.equals(yearValue)) && ((titleValue == null) || titleValue.trim().isEmpty()) && ((authorValue == null) || authorValue.trim().isEmpty())) { // && ((sortValue == null) || sortValue.trim().isEmpty())) { @@ -146,14 +148,13 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab { } publications.addOrder("title"); - publications.setRange(1, config.getGreetingSize() + 1); - - yearFilter.setDataQuery(publications, "year"); + yearFilter.setDataQuery(getData(orgaunit), "year"); yearFilter.generateXml(filtersElem); titleFilter.generateXml(filtersElem); authorFilter.generateXml(filtersElem); + publications.setRange(1, config.getGreetingSize() + 1); } else { /*if (SORT_BY_AUTHOR.equals(sortValue)) { @@ -206,7 +207,7 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab { publications.addOrder("title"); } - yearFilter.setDataQuery(publications, "year"); + yearFilter.setDataQuery(getData(orgaunit), "year"); applyYearFilter(publications, request); applyTitleFilter(publications, request); @@ -216,8 +217,8 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab { (int) publications.size(), config.getPageSize()); - if (paginator.getPageCount() > config.getEnableSearchLimit()) { - yearFilter.generateXml(filtersElem); + yearFilter.generateXml(filtersElem); + if (paginator.getPageCount() > config.getEnableSearchLimit()) { titleFilter.generateXml(filtersElem); authorFilter.generateXml(filtersElem); } diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java index af5e1c8e9..c88ef393c 100644 --- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java +++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java @@ -258,6 +258,7 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab { final PageState state) { final long start = System.currentTimeMillis(); final XmlGenerator generator = new XmlGenerator(member); + generator.setItemElemName("head", ""); generator.setUseExtraXml(false); generator.generateXML(state, parent, ""); logger.debug(String.format("Generated XML for member '%s' in %d ms.",