From 42694b6dad261fd70d613b17b3e7baa4a455ac59 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 25 Nov 2011 20:32:55 +0000 Subject: [PATCH] Verschiedene Bug Fixes. git-svn-id: https://svn.libreccm.org/ccm/trunk@1299 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/navigation/ui/GreetingItem.java | 2 +- .../ui/SciDepartmentProjectsTab.java | 2 +- .../ui/SciDepartmentPublicationsTab.java | 7 +++-- .../ui/SciInstituteProjectsTab.java | 2 +- .../ui/SciInstitutePublicationsTab.java | 4 +-- .../ui/SciInstituteSummaryTab.java | 6 ++-- .../ui/SciInstituteSummaryTabConfig.java | 30 +++++++++++++------ ...ituteSummaryTabConfig_parameter.properties | 21 ++++++++----- 8 files changed, 47 insertions(+), 27 deletions(-) diff --git a/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java b/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java index f0bd8fd0e..78a72ef65 100755 --- a/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java +++ b/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java @@ -66,7 +66,7 @@ public class GreetingItem extends AbstractComponent { return null; } - if (!ContentItem.VERSION.equals(item.getVersion())) { + if (!ContentItem.LIVE.equals(item.getVersion())) { item = item.getLiveVersion(); } diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java index 98fc1307d..151e4e779 100644 --- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java +++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java @@ -172,7 +172,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab { subDepartmentsQuery.setParameter("orgaunitId", orgaunit.getID().toString()); subDepartmentsQuery.setParameter("assocType", - SciDepartmentProjectsStep.ASSOC_TYPE); + SciDepartmentSubDepartmentsStep.ASSOC_TYPE); while (subDepartmentsQuery.next()) { /*if (projectsFilter.length() > 0) { diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java index 4d49ebc1a..35996ebbb 100644 --- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java +++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java @@ -112,7 +112,7 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab { depPublicationsElem.newChildElement("greeting"); - publications.addOrder("year"); + publications.addOrder("year desc"); if (config.getOneRowPerAuthor()) { publications.addOrder("surname"); } else { @@ -172,6 +172,7 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab { publications.addOrder("year asc"); }*/ + publications.addOrder("year desc"); if (config.getOneRowPerAuthor()) { publications.addOrder("surname"); publications.addOrder("title"); @@ -180,7 +181,7 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab { publications.addOrder("title"); } - yearFilter.setDataQuery(publications, "year"); + yearFilter.setDataQuery(getData(orgaunit), "year"); applyYearFilter(publications, request); applyTitleFilter(publications, request); @@ -351,7 +352,7 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab { final long start = System.currentTimeMillis(); final XmlGenerator generator = new XmlGenerator(publication); generator.setUseExtraXml(false); - generator.setItemElemName("publication", ""); + generator.setItemElemName("publications", ""); generator.generateXML(state, parent, ""); logger.debug(String.format( "Generated XML for publication '%s' in %d ms.", diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java index 3c402db11..e8b9a6341 100644 --- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java +++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java @@ -175,7 +175,7 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab { subDepartmentsQuery.setParameter("orgaunitId", orgaunit.getID().toString()); subDepartmentsQuery.setParameter("assocType", - SciInstituteProjectsStep.ASSOC_TYPE); + SciInstituteDepartmentsStep.ASSOC_TYPE); while (subDepartmentsQuery.next()) { /*if (projectsFilter.length() > 0) { 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 8fbe9ff7c..f75d1f482 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 @@ -138,7 +138,7 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab { publicationsElem.newChildElement("greeting"); - publications.addOrder("year"); + publications.addOrder("year desc"); if (config.getOneRowPerAuthor()) { publications.addOrder("surname"); } else { @@ -374,7 +374,7 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab { final long start = System.currentTimeMillis(); final XmlGenerator generator = new XmlGenerator(publication); generator.setUseExtraXml(false); - generator.setItemElemName("publication", ""); + generator.setItemElemName("publications", ""); generator.generateXML(state, parent, ""); logger.debug(String.format( "Generated XML for publication '%s' in %d ms.", 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 04c96fd29..af5e1c8e9 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 @@ -54,8 +54,10 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab { if (config.isShowingHead()) { generateHeadOfInstituteXml(institute, instituteSummaryElem, state); } - - generateDepartmentsXml(institute, instituteSummaryElem, state); + + if (config.isShowingDepartments()) { + generateDepartmentsXml(institute, instituteSummaryElem, state); + } logger.debug(String.format("Generated XML for summary tab of institute " + "'%s' in %d ms.", diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig.java index db5419c87..fc3280960 100644 --- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig.java +++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig.java @@ -11,46 +11,58 @@ import com.arsdigita.util.parameter.StringParameter; * @version $Id$ */ public class SciInstituteSummaryTabConfig extends AbstractConfig { - + private final Parameter showHeads; private final Parameter headRole; private final Parameter activeStatus; - + private final Parameter showDepartments; + public SciInstituteSummaryTabConfig() { showHeads = new BooleanParameter( "com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.show", Parameter.REQUIRED, true); - + headRole = new StringParameter( "com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role", Parameter.REQUIRED, "head"); - + activeStatus = new StringParameter( "com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active", Parameter.REQUIRED, "active"); - + + showDepartments = + new BooleanParameter( + "com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show", + Parameter.REQUIRED, + true); + register(showHeads); register(headRole); register(activeStatus); - + register(showDepartments); + loadInfo(); } - + public final boolean isShowingHead() { return (Boolean) get(showHeads); } - + public final String getHeadRole() { return (String) get(headRole); } - + public final String getActiveStatus() { return (String) get(activeStatus); } + + public final Boolean isShowingDepartments() { + return (Boolean) get(showDepartments); + } } diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig_parameter.properties b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig_parameter.properties index 52b0c11e7..c15fe74e3 100644 --- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig_parameter.properties +++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig_parameter.properties @@ -3,12 +3,17 @@ com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.show.purpose = Show com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.show.example = true com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.show.format = [Boolean] -com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role = Role of the heads of the institute -com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role = Role of the heads of the institute. This is an attribute of the association between GenericOrganizationalUnit and GenericPerson. This value may contains more than value, separated by ','. -com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role = active,heading -com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role = [String] +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role.title = Role of the heads of the institute +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role.purpose = Role of the heads of the institute. This is an attribute of the association between GenericOrganizationalUnit and GenericPerson. This value may contains more than value, separated by ','. +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role.example = active,heading +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role.format = [String] -com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active = Status of active members -com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active = Status of the active members of the institute. Used to filter out former heads. This is an attribute of the association between GenericOrganizationalUnit and GenericPerson. This value may contains more than value, separated by ','. -com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active = former,formerHead -com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active = [String] +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active.title = Status of active members +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active.purpose = Status of the active members of the institute. Used to filter out former heads. This is an attribute of the association between GenericOrganizationalUnit and GenericPerson. This value may contains more than value, separated by ','. +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active.example = former,formerHead +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active.format = [String] + +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show.title = Show departments? +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show.purpose = Show departments? +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show.example = true +com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show.format = [Boolean] \ No newline at end of file