From 419233fabe529de3652401ff0d288888151140b6 Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 13 Aug 2009 11:40:19 +0000 Subject: [PATCH] =?UTF-8?q?Fehler=20bei=20den=20Verkn=C3=BCpfungen=20behob?= =?UTF-8?q?en,=20XML-Ausgabe=20funktioniert=20jetzt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@231 8810af33-2d31-482b-a856-94f89814c4df --- .../pdl/com/arsdigita/content-types/GenericOrganization.pdl | 2 +- .../cms/contenttypes/GenericOrganizationInitializer.java | 4 ++-- .../pdl/com/arsdigita/content-types/OrganizationalUnit.pdl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl index 6b0d7e9f9..7c05acae1 100644 --- a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl +++ b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl @@ -29,7 +29,7 @@ object type GenericOrganization extends ContentPage { String[0..1] description = ct_genericorganizations.description VARCHAR(2000); OrganizationRole[0..n] organizationroles = join ct_genericorganizations.organization_id to ct_organizationroles.owner_id; - OrganizationalUnit[0..n] subunits = join ct_genericorganizations.organization_id to ct_orga2orgaunits.orga2orgaunit_id; + Orga2OrgaUnit[0..n] subunits = join ct_genericorganizations.organization_id to ct_orga2orgaunits.owner_id; reference key (ct_genericorganizations.organization_id); } \ No newline at end of file diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationInitializer.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationInitializer.java index 9a3cc96a1..e27f5bc53 100644 --- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationInitializer.java +++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationInitializer.java @@ -47,10 +47,10 @@ public class GenericOrganizationInitializer extends ContentTypeInitializer { * * @return path of the traversal-adapter XML file. */ - /*@Override + @Override public String getTraversalXML() { return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/GenericOrganization.xml"; - }*/ + } /** * diff --git a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl index 951851173..45d5c565b 100644 --- a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl +++ b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl @@ -27,7 +27,7 @@ object type OrganizationalUnit extends ContentPage { String[0..1] organizationalunitName = ct_organizationalunits.organizationalunit_name VARCHAR(512); String[0..1] organizationalunitDescription = ct_organizationalunits.organizationalunit_description VARCHAR(2048); - OrganizationalUnit subunits = join ct_organizationalunits.organizationalunit_id to ct_orgaunit2orgaunits.owner_id; + OrgaUnit2OrgaUnit[0..n] subunits = join ct_organizationalunits.organizationalunit_id to ct_orgaunit2orgaunits.owner_id; Membership[0..n] memberships = join ct_organizationalunits.organizationalunit_id to ct_memberships.owner_id; reference key (ct_organizationalunits.organizationalunit_id);