From f47891aae6ad8a5c5340a0184e17d897eaf8128a Mon Sep 17 00:00:00 2001 From: jensp Date: Mon, 3 Aug 2009 15:27:24 +0000 Subject: [PATCH] ResearchNetwork so weit fertig mit ein paar Macken git-svn-id: https://svn.libreccm.org/ccm/trunk@226 8810af33-2d31-482b-a856-94f89814c4df --- ccm-cms-types-researchnetwork/application.xml | 3 +-- .../com/arsdigita/content-types/ResearchNetwork.pdl | 12 ++++++------ .../content-types/ResearchNetworkMembership.pdl | 6 +++--- .../arsdigita/cms/contenttypes/ResearchNetwork.xml | 10 +++++++++- .../src/ccm-cms-types-researchnetwork.load | 2 +- .../cms/contenttypes/ResearchNetworkMembership.java | 4 ++-- .../ui/ResearchNetworkMembershipPropertiesStep.java | 2 +- .../ui/ResearchNetworkMembershipTable.java | 1 - .../ui/ResearchNetworkPropertiesStep.java | 8 ++++++++ 9 files changed, 31 insertions(+), 17 deletions(-) diff --git a/ccm-cms-types-researchnetwork/application.xml b/ccm-cms-types-researchnetwork/application.xml index bd93c6dc3..2d1d3e33d 100644 --- a/ccm-cms-types-researchnetwork/application.xml +++ b/ccm-cms-types-researchnetwork/application.xml @@ -1,7 +1,6 @@ diff --git a/ccm-cms-types-researchnetwork/pdl/com/arsdigita/content-types/ResearchNetwork.pdl b/ccm-cms-types-researchnetwork/pdl/com/arsdigita/content-types/ResearchNetwork.pdl index 64af6d364..26f2dfd1b 100644 --- a/ccm-cms-types-researchnetwork/pdl/com/arsdigita/content-types/ResearchNetwork.pdl +++ b/ccm-cms-types-researchnetwork/pdl/com/arsdigita/content-types/ResearchNetwork.pdl @@ -23,12 +23,12 @@ import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.DomainObject; -object type type ResearchNetwork extends ContentPage { - String[1..1] researchNetworkTitle = ct_researchNetworks.researchnetwork_title VARCHAR(512); - String[0..1] researchNetworkDirection = ct_researchnetwork.researchnetwork_direction VARCHAR(1024); - String[0..1] researchNetworkCoordination = ct_researchnetwork.researchnetwork_coordination VARCHAR(1024); - String[0..1] researchNetworkDescription = ct_researchnetwork.researchnetwork_description VARCHAR(4096); - String[0..1] researchNetworkWebsite = ct_researchnetwork.researchnetwork_website VARCHAR(512); +object type ResearchNetwork extends ContentPage { + String[0..1] researchNetworkTitle = ct_researchnetworks.researchnetwork_title VARCHAR(512); + String[0..1] researchNetworkDirection = ct_researchnetworks.researchnetwork_direction VARCHAR(1024); + String[0..1] researchNetworkCoordination = ct_researchnetworks.researchnetwork_coordination VARCHAR(1024); + String[0..1] researchNetworkDescription = ct_researchnetworks.researchnetwork_description VARCHAR(4096); + String[0..1] researchNetworkWebsite = ct_researchnetworks.researchnetwork_website VARCHAR(512); reference key (ct_researchnetworks.researchnetwork_id); } \ No newline at end of file diff --git a/ccm-cms-types-researchnetwork/pdl/com/arsdigita/content-types/ResearchNetworkMembership.pdl b/ccm-cms-types-researchnetwork/pdl/com/arsdigita/content-types/ResearchNetworkMembership.pdl index 66e28c5a2..f798d63be 100644 --- a/ccm-cms-types-researchnetwork/pdl/com/arsdigita/content-types/ResearchNetworkMembership.pdl +++ b/ccm-cms-types-researchnetwork/pdl/com/arsdigita/content-types/ResearchNetworkMembership.pdl @@ -21,15 +21,15 @@ import com.arsdigita.cms.ContentItem; import com.arsdigita.kernel.ACSObject; object type ResearchNetworkMembership extends ACSObject { - Person[0..1] targetItem = join ct_researchnetworkmemberships_target_item_id to ct_persons.person_id; + Person[0..1] targetItem = join ct_researchnetworkmemberships.target_item_id to ct_persons.person_id; reference key(ct_researchnetworkmemberships.membership_id); aggressive load (membershipOwner.id); } association { - composite ResearchNetwork[0..1] membershipOwner = join ct_researchnetworkmemberships.owner_id to ct_researchnetworks_researchnetwork_id; - composite ResearchNetworkMembers[0..n] members = join ct_researchnetworks.researchnetwork.id to ct_researchnetworkmemberships.owner_id; + composite ResearchNetwork[0..1] membershipOwner = join ct_researchnetworkmemberships.owner_id to ct_researchnetworks.researchnetwork_id; + composite ResearchNetworkMembership[0..n] members = join ct_researchnetworks.researchnetwork_id to ct_researchnetworkmemberships.owner_id; } query getResearchNetworkMembershipsReferingToResearchNetworks { diff --git a/ccm-cms-types-researchnetwork/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ResearchNetwork.xml b/ccm-cms-types-researchnetwork/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ResearchNetwork.xml index 45b4331d9..e929c63ea 100644 --- a/ccm-cms-types-researchnetwork/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ResearchNetwork.xml +++ b/ccm-cms-types-researchnetwork/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ResearchNetwork.xml @@ -15,9 +15,17 @@ labelBundle="com.arsdigita.cms.contenttypes.ResearchNetworkResources" descriptionKey="researchnetwork.authoring.basic_properties.description" descriptionBundle="com.arsdigita.cms.contenttypes.ResearchnetworkResources" - component="com.arsdigita.cms.contenttypes.ui.researchnetwork.ResearchNetworkPropertiesStep" + component="com.arsdigita.cms.contenttypes.ui.ResearchNetworkPropertiesStep" ordering="1"/> + + + diff --git a/ccm-cms-types-researchnetwork/src/ccm-cms-types-researchnetwork.load b/ccm-cms-types-researchnetwork/src/ccm-cms-types-researchnetwork.load index 95e48ef45..543dde2e8 100644 --- a/ccm-cms-types-researchnetwork/src/ccm-cms-types-researchnetwork.load +++ b/ccm-cms-types-researchnetwork/src/ccm-cms-types-researchnetwork.load @@ -8,7 +8,7 @@ -
+
diff --git a/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ResearchNetworkMembership.java b/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ResearchNetworkMembership.java index 81a2bfefb..a53403c32 100644 --- a/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ResearchNetworkMembership.java +++ b/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ResearchNetworkMembership.java @@ -27,8 +27,8 @@ import org.apache.log4j.Logger; public class ResearchNetworkMembership extends ACSObject { private static final Logger s_log = Logger.getLogger(ResearchNetwork.class); - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.ResearchNetworkMember"; - public static final String MEMBER_OWNER = "memberOwner"; + public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.ResearchNetworkMembership"; + public static final String MEMBER_OWNER = "membershipOwner"; public static final String TARGET_ITEM = "targetItem"; public ResearchNetworkMembership() { diff --git a/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkMembershipPropertiesStep.java b/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkMembershipPropertiesStep.java index d9db6b48d..df71c7406 100644 --- a/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkMembershipPropertiesStep.java +++ b/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkMembershipPropertiesStep.java @@ -60,7 +60,7 @@ public class ResearchNetworkMembershipPropertiesStep extends ResettableContainer return container; } - public FormSection getEditSheet() { + public FormSection getEditSheet() { ResearchNetworkMembershipPropertyForm propertyForm = new ResearchNetworkMembershipPropertyForm(m_itemModel, m_membershipModel); propertyForm.setPropertiesStep(this); return propertyForm; diff --git a/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkMembershipTable.java b/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkMembershipTable.java index 1f0aaf5dd..90b5cfc95 100644 --- a/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkMembershipTable.java +++ b/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkMembershipTable.java @@ -16,7 +16,6 @@ import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.SecurityManager; -import com.arsdigita.cms.contenttypes.Membership; import com.arsdigita.cms.contenttypes.Person; import com.arsdigita.cms.contenttypes.ResearchNetworkMembership; import com.arsdigita.domain.DataObjectNotFoundException; diff --git a/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkPropertiesStep.java b/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkPropertiesStep.java index 393d386a0..85b2483f3 100644 --- a/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkPropertiesStep.java +++ b/ccm-cms-types-researchnetwork/src/com/arsdigita/cms/contenttypes/ui/ResearchNetworkPropertiesStep.java @@ -6,6 +6,7 @@ import com.arsdigita.bebop.util.GlobalizationUtil; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.contenttypes.ResearchNetwork; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ui.authoring.SimpleEditStep; @@ -39,6 +40,13 @@ public class ResearchNetworkPropertiesStep extends SimpleEditStep { public static Component getResearchNetworkPropertySheet(ItemSelectionModel itemModel) { DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel); + //Display the properties + sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.researchnetwork.title"), ResearchNetwork.RESEARCHNETWORK_TITLE); + sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.researchnetwork.direction"), ResearchNetwork.RESEARCHNETWORK_DIRECTION); + sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.researchnetwork.coordination"), ResearchNetwork.RESEARCHNETWORK_COORDINATION); + sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.researchnetwork.website"), ResearchNetwork.RESEARCHNETWORK_WEBSITE); + sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.researchnetwork.direction"), ResearchNetwork.RESEARCHNETWORK_DESCRIPTION); + if (!ContentSection.getConfig().getHideLaunchDate()) { sheet.add(GlobalizationUtil.globalize("cms.ui.authoring.page_launch_date"), ContentPage.LAUNCH_DATE, new DomainObjectPropertySheet.AttributeFormatter() {