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

- Anlegen einer Sprachvariante beim MPA funktioniert jetzt wieder 

- Verschiedene weitere BugFixex (NPE unter bestimmten Umständen etc)


git-svn-id: https://svn.libreccm.org/ccm/trunk@1302 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-11-28 16:37:20 +00:00
parent 77235afa1c
commit 1f6488cd8c
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ccm-cms/src/com/arsdigita/cms/LanguageAwareObjectCopier.java
View File

@ -45,9 +45,10 @@ public class LanguageAwareObjectCopier extends ObjectCopier {
m_traversed.add(selem, reverse); m_traversed.add(selem, reverse);
DomainObject telem = copy(source, target, selem, prop); DomainObject telem = copy(source, target, selem, prop);
if (telem instanceof ContentPage) { if ((telem instanceof ContentPage)
ContentPage tpage = (ContentPage) telem; && ((ContentPage) telem).getContentBundle() != null) {
telem = tpage.getContentBundle().getInstance(language); telem = ((ContentPage) telem).getContentBundle().getInstance(
language);
} }
DataObject tgtLink = null; DataObject tgtLink = null;

3
ccm-sci-personalprojects/src/com/arsdigita/cms/publicpersonalprofile/PersonalProjects.java
View File

@ -120,7 +120,8 @@ public class PersonalProjects implements ContentGenerator {
final Calendar today = new GregorianCalendar(); final Calendar today = new GregorianCalendar();
final Date todayDate = today.getTime(); final Date todayDate = today.getTime();
for (SciProject project : projects) { for (SciProject project : projects) {
if (project.getEnd().before(todayDate)) { if ((project.getEnd() != null)
&& project.getEnd().before(todayDate)) {
finishedProjects.add(project); finishedProjects.add(project);
} else { } else {
currentProjects.add(project); currentProjects.add(project);

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

@ -131,7 +131,9 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab {
"objectType = 'com.arsdigita.cms.contenttypes.WorkingPaper'"); "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()) && ((titleValue == null) || titleValue.trim().isEmpty())
&& ((authorValue == null) || authorValue.trim().isEmpty())) { && ((authorValue == null) || authorValue.trim().isEmpty())) {
// && ((sortValue == null) || sortValue.trim().isEmpty())) { // && ((sortValue == null) || sortValue.trim().isEmpty())) {
@ -146,14 +148,13 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab {
} }
publications.addOrder("title"); publications.addOrder("title");
publications.setRange(1, config.getGreetingSize() + 1); yearFilter.setDataQuery(getData(orgaunit), "year");
yearFilter.setDataQuery(publications, "year");
yearFilter.generateXml(filtersElem); yearFilter.generateXml(filtersElem);
titleFilter.generateXml(filtersElem); titleFilter.generateXml(filtersElem);
authorFilter.generateXml(filtersElem); authorFilter.generateXml(filtersElem);
publications.setRange(1, config.getGreetingSize() + 1);
} else { } else {
/*if (SORT_BY_AUTHOR.equals(sortValue)) { /*if (SORT_BY_AUTHOR.equals(sortValue)) {
@ -206,7 +207,7 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab {
publications.addOrder("title"); publications.addOrder("title");
} }
yearFilter.setDataQuery(publications, "year"); yearFilter.setDataQuery(getData(orgaunit), "year");
applyYearFilter(publications, request); applyYearFilter(publications, request);
applyTitleFilter(publications, request); applyTitleFilter(publications, request);
@ -216,8 +217,8 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab {
(int) publications.size(), (int) publications.size(),
config.getPageSize()); config.getPageSize());
if (paginator.getPageCount() > config.getEnableSearchLimit()) { yearFilter.generateXml(filtersElem);
yearFilter.generateXml(filtersElem); if (paginator.getPageCount() > config.getEnableSearchLimit()) {
titleFilter.generateXml(filtersElem); titleFilter.generateXml(filtersElem);
authorFilter.generateXml(filtersElem); authorFilter.generateXml(filtersElem);
} }

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

@ -258,6 +258,7 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab {
final PageState state) { final PageState state) {
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
final XmlGenerator generator = new XmlGenerator(member); final XmlGenerator generator = new XmlGenerator(member);
generator.setItemElemName("head", "");
generator.setUseExtraXml(false); generator.setUseExtraXml(false);
generator.generateXML(state, parent, ""); generator.generateXML(state, parent, "");
logger.debug(String.format("Generated XML for member '%s' in %d ms.", logger.debug(String.format("Generated XML for member '%s' in %d ms.",