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

Fehlerkorrekturen an den Sci-Modulen und an den Basisklassen für Organization in ccm-cms 

git-svn-id: https://svn.libreccm.org/ccm/trunk@551 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2010-10-02 09:54:47 +00:00
parent 4623f9fedb
commit 21bbb6d7a5
12 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java
View File

@ -122,9 +122,6 @@ public class GenericOrganizationalUnitPropertiesStep extends SimpleEditStep {
addStep(new GenericOrganizationalUnitContactPropertiesStep(itemModel,
parent),
"cms.contenttypes.ui.orgaunit.contact");
addStep(new GenericOrganizationalUnitChildrenPropertiesStep(itemModel,
parent),
"cms.contenttypes.ui.orgaunit.child");
addStep(new GenericOrganizationalUnitPersonPropertiesStep(itemModel,
parent),
"cms.contenttypes.ui.orgaunit.persons");

2
ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml
View File

@ -5,7 +5,7 @@
xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
<ctd:content-type
label="CollectedVolume"
label="SciPublications/CollectedVolume"
description="Base type for collectedVolumes"
objectType="com.arsdigita.cms.contenttypes.CollectedVolume"
classname="com.arsdigita.cms.contenttypes.CollectedVolume">

2
ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Proceedings.xml
View File

@ -5,7 +5,7 @@
xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
<ctd:content-type
label="Proceedings"
label="SciPublications/Proceedings"
description="Base type for collectedVolumes"
objectType="com.arsdigita.cms.contenttypes.Proceedings"
classname="com.arsdigita.cms.contenttypes.Proceedings">

1
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherPropertyForm.java
View File

@ -17,6 +17,7 @@ import com.arsdigita.cms.contenttypes.PublicationWithPublisher;
import com.arsdigita.cms.contenttypes.Publisher;
import com.arsdigita.cms.ui.ItemSearchWidget;
import org.apache.log4j.Logger;
import org.apache.lucene.analysis.LengthFilter;
/**
*

2
ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciDepartment.pdl
View File

@ -25,7 +25,7 @@ association {
association {
SciDepartment[0..1] department = join ct_scidepartments.department_id
to ct_scidepartments_projects_map.department_id,
join ct_scidepartments_projects_map.project_id,
join ct_scidepartments_projects_map.project_id
to ct_sciprojects.project_id;
SciProject[0..n] projects = join ct_sciprojects.project_id

5
ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml
View File

@ -6,10 +6,9 @@
<ctd:content-type
label="SciDepartment"
description="Base type for publications"
description="Base type for departments of scientific organizations"
objectType="com.arsdigita.cms.contenttypes.SciDepartment"
classname="com.arsdigita.cms.contenttypes.SciDepartment"
isInternal="yes">
classname="com.arsdigita.cms.contenttypes.SciDepartment">
<ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">

5
ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.pdl → ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml
View File

@ -6,10 +6,9 @@
<ctd:content-type
label="SciOrganization"
description="Base type for publications"
description="Base type for scientific orgnizations"
objectType="com.arsdigita.cms.contenttypes.SciOrganization"
classname="com.arsdigita.cms.contenttypes.SciOrganization"
isInternal="yes">
classname="com.arsdigita.cms.contenttypes.SciOrganization">
<ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">

5
ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
View File

@ -6,10 +6,9 @@
<ctd:content-type
label="SciProject"
description="Base type for publications"
description="Projects of scientific organizations."
objectType="com.arsdigita.cms.contenttypes.SciProject"
classname="com.arsdigita.cms.contenttypes.SciProject"
isInternal="yes">
classname="com.arsdigita.cms.contenttypes.SciProject">
<ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">

10
ccm-sci-types-organization/src/ccm-sci-types-organization.load
View File

@ -6,15 +6,15 @@
<initializer class="com.arsdigita.cms.Initializer"/>
</requires>
<provides>
<table name="ct_sciorganizatations"/>
<table name="ct_sciorganizations"/>
<table name="ct_scidepartments"/>
<table name="ct_sciprojects"/>
<initializer name="com.arsdigita.cms.contenttypes.SciOrganizationInitializer"/>
<initializer name="com.arsdigita.cms.contenttypes.SciDepartmentInitializer"/>
<initializer name="com.arsdigita.cms.contenttypes.SciProjectInitializer"/>
<initializer class="com.arsdigita.cms.contenttypes.SciOrganizationInitializer"/>
<initializer class="com.arsdigita.cms.contenttypes.SciDepartmentInitializer"/>
<initializer class="com.arsdigita.cms.contenttypes.SciProjectInitializer"/>
</provides>
<scripts>
<schema directory="ccm-sci-types.organization"/>
<schema directory="ccm-sci-types-organization"/>
<data class="com.arsdigita.cms.contenttypes.SciOrganizationLoader"/>
<data class="com.arsdigita.cms.contenttypes.SciDepartmentLoader"/>
<data class="com.arsdigita.cms.contenttypes.SciProjectLoader"/>

2
ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationInitializer.java
View File

@ -12,7 +12,7 @@ public class SciOrganizationInitializer extends ContentTypeInitializer {
SciOrganizationInitializer.class);
public SciOrganizationInitializer() {
super("ccm-sci-types-organization.odl.mf",
super("ccm-sci-types-organization.pdl.mf",
SciOrganization.BASE_DATA_OBJECT_TYPE);
}

3
ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationLoader.java
View File

@ -6,12 +6,11 @@ package com.arsdigita.cms.contenttypes;
*/
public class SciOrganizationLoader extends AbstractContentTypeLoader {
private static final String[] TYPES = {
private static final String[] TYPES = {
"/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml"
};
public String[] getTypes() {
return TYPES;
}
}

6
ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciProjectSubProjectsCollection.java
View File

@ -52,7 +52,7 @@ public class SciProjectSubProjectsCollection extends DomainCollection {
link.set(ORDER, order);
}
public void swapWithNext(SciSubProject subproject) {
public void swapWithNext(SciProject subproject) {
int currentPosition = 0;
int currentIndex = 0;
int nextIndex = 0;
@ -99,7 +99,7 @@ public class SciProjectSubProjectsCollection extends DomainCollection {
this.rewind();
}
public void swapWithPrevious(SciSubProject subproject) {
public void swapWithPrevious(SciProject subproject) {
int previousPosition = 0;
int previousIndex = 0;
int currentPosition = 0;
@ -148,7 +148,7 @@ public class SciProjectSubProjectsCollection extends DomainCollection {
this.rewind();
}
public SciSubProject getSubProject() {
public SciProject getSubProject() {
return new SciProject(m_dataCollection.getDataObject());
}
}