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

Verschiedene Daten zum ExtraXML von SciDepartment hinzugefügt. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2431 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-11-08 14:31:26 +00:00
parent b4c8a8ca96
commit 0537142e38
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql
View File

@ -46,7 +46,8 @@ ALTER TABLE init_requirements
update application_types 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%' ; where object_type like '%london.navigation%' ;
-- table applications doesn't require an update -- table applications doesn't require an update

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

@ -51,6 +51,9 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener
final SciDepartment department = (SciDepartment) item; final SciDepartment department = (SciDepartment) item;
if (getListMode()) { if (getListMode()) {
final Element shortDescElem = element.newChildElement("shortDescription");
shortDescElem.setText(department.getDepartmentShortDescription());
if (CONFIG.getShowHeadInList()) { if (CONFIG.getShowHeadInList()) {
generateHeadOfDepartmentXml(department, element, state); generateHeadOfDepartmentXml(department, element, state);
} }
@ -101,7 +104,7 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener
activeStatus)); activeStatus));
} }
final Element elem = parent.newChildElement(elemName); final Element elem = parent.newChildElement(String.format("%ss", elemName));
final GenericOrganizationalUnitPersonCollection persons = department.getPersons(); final GenericOrganizationalUnitPersonCollection persons = department.getPersons();
persons.addFilter(roleFilter.toString()); persons.addFilter(roleFilter.toString());
@ -121,7 +124,7 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener
parent, parent,
state, state,
CONFIG.getHeadRole(), CONFIG.getHeadRole(),
"heads"); "head");
} }
protected void generateViceHeadOfDepartmentXml(final SciDepartment department, protected void generateViceHeadOfDepartmentXml(final SciDepartment department,
@ -131,7 +134,7 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener
parent, parent,
state, state,
CONFIG.getViceHeadRole(), CONFIG.getViceHeadRole(),
"viceheads"); "vicehead");
} }
protected void generateSecretariatOfDepartmentXml(final SciDepartment department, protected void generateSecretariatOfDepartmentXml(final SciDepartment department,

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

@ -145,7 +145,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab {
activeStatus)); activeStatus));
} }
final Element elem = parent.newChildElement(elemName); final Element elem = parent.newChildElement(String.format("%ss", elemName));
final GenericOrganizationalUnitPersonCollection persons = department.getPersons(); final GenericOrganizationalUnitPersonCollection persons = department.getPersons();
persons.addFilter(roleFilter.toString()); persons.addFilter(roleFilter.toString());
@ -165,7 +165,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab {
parent, parent,
state, state,
CONFIG.getHeadRole(), CONFIG.getHeadRole(),
"heads"); "head");
} }
protected void generateViceHeadOfDepartmentXml(final SciDepartment department, protected void generateViceHeadOfDepartmentXml(final SciDepartment department,
@ -175,7 +175,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab {
parent, parent,
state, state,
CONFIG.getViceHeadRole(), CONFIG.getViceHeadRole(),
"viceheads"); "vicehead");
} }
protected void generateSecretariatOfDepartmentXml(final SciDepartment department, protected void generateSecretariatOfDepartmentXml(final SciDepartment department,

4
ccm-subsite/src/com/arsdigita/subsite/Site.java
View File

@ -71,6 +71,10 @@ public class Site extends ACSObject {
super(obj); super(obj);
} }
public Site(final OID oid) {
super(oid);
}
public static Site create(String title, public static Site create(String title,
String description, String description,
String hostname, String hostname,