From 0537142e38473f1b99f67f1ea5124d62316d651e Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 8 Nov 2013 14:31:26 +0000 Subject: [PATCH] =?UTF-8?q?Verschiedene=20Daten=20zum=20ExtraXML=20von=20S?= =?UTF-8?q?ciDepartment=20hinzugef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@2431 8810af33-2d31-482b-a856-94f89814c4df --- .../upgrade/default/6.6.2-6.6.3/upd_system_tables.sql | 3 ++- .../ui/SciDepartmentExtraXmlGenerator.java | 11 +++++++---- .../cms/contenttypes/ui/SciDepartmentSummaryTab.java | 6 +++--- ccm-subsite/src/com/arsdigita/subsite/Site.java | 4 ++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql b/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql index 21b6ad9b7..8b590a028 100644 --- a/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql +++ b/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql @@ -46,7 +46,8 @@ ALTER TABLE init_requirements update application_types - set object_type=replace(object_type,'london.navigation','navigation') + set object_type=replace(object_type,'london.navigation','navigation'), + singleton_p=false where object_type like '%london.navigation%' ; -- table applications doesn't require an update diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentExtraXmlGenerator.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentExtraXmlGenerator.java index 48bf204b5..ff01b1339 100644 --- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentExtraXmlGenerator.java +++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentExtraXmlGenerator.java @@ -49,8 +49,11 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener } final SciDepartment department = (SciDepartment) item; - + if (getListMode()) { + final Element shortDescElem = element.newChildElement("shortDescription"); + shortDescElem.setText(department.getDepartmentShortDescription()); + if (CONFIG.getShowHeadInList()) { generateHeadOfDepartmentXml(department, element, state); } @@ -101,7 +104,7 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener activeStatus)); } - final Element elem = parent.newChildElement(elemName); + final Element elem = parent.newChildElement(String.format("%ss", elemName)); final GenericOrganizationalUnitPersonCollection persons = department.getPersons(); persons.addFilter(roleFilter.toString()); @@ -121,7 +124,7 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener parent, state, CONFIG.getHeadRole(), - "heads"); + "head"); } protected void generateViceHeadOfDepartmentXml(final SciDepartment department, @@ -131,7 +134,7 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener parent, state, CONFIG.getViceHeadRole(), - "viceheads"); + "vicehead"); } protected void generateSecretariatOfDepartmentXml(final SciDepartment department, diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java index ca67fed94..529d7b99c 100644 --- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java +++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java @@ -145,7 +145,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab { activeStatus)); } - final Element elem = parent.newChildElement(elemName); + final Element elem = parent.newChildElement(String.format("%ss", elemName)); final GenericOrganizationalUnitPersonCollection persons = department.getPersons(); persons.addFilter(roleFilter.toString()); @@ -165,7 +165,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab { parent, state, CONFIG.getHeadRole(), - "heads"); + "head"); } protected void generateViceHeadOfDepartmentXml(final SciDepartment department, @@ -175,7 +175,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab { parent, state, CONFIG.getViceHeadRole(), - "viceheads"); + "vicehead"); } protected void generateSecretariatOfDepartmentXml(final SciDepartment department, diff --git a/ccm-subsite/src/com/arsdigita/subsite/Site.java b/ccm-subsite/src/com/arsdigita/subsite/Site.java index ceb6a5d75..a483df92b 100755 --- a/ccm-subsite/src/com/arsdigita/subsite/Site.java +++ b/ccm-subsite/src/com/arsdigita/subsite/Site.java @@ -70,6 +70,10 @@ public class Site extends ACSObject { public Site(DataObject obj) { super(obj); } + + public Site(final OID oid) { + super(oid); + } public static Site create(String title, String description,