ResearchNetwork so weit fertig mit ein paar Macken

git-svn-id: https://svn.libreccm.org/ccm/trunk@226 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2009-08-03 15:27:24 +00:00
parent 10fa3e3c3d
commit f47891aae6
9 changed files with 31 additions and 17 deletions

View File

@ -1,7 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
name="ccm-cms-types-organizationalunit" name="ccm-cms-types-researchnetwork"
prettyName="Red Hat CCM Content Types"
version="6.6.0" version="6.6.0"
release="1" release="1"
webapp="ROOT"> webapp="ROOT">

View File

@ -23,12 +23,12 @@ import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentPage;
import com.arsdigita.cms.DomainObject; import com.arsdigita.cms.DomainObject;
object type type ResearchNetwork extends ContentPage { object type ResearchNetwork extends ContentPage {
String[1..1] researchNetworkTitle = ct_researchNetworks.researchnetwork_title VARCHAR(512); String[0..1] researchNetworkTitle = ct_researchnetworks.researchnetwork_title VARCHAR(512);
String[0..1] researchNetworkDirection = ct_researchnetwork.researchnetwork_direction VARCHAR(1024); String[0..1] researchNetworkDirection = ct_researchnetworks.researchnetwork_direction VARCHAR(1024);
String[0..1] researchNetworkCoordination = ct_researchnetwork.researchnetwork_coordination VARCHAR(1024); String[0..1] researchNetworkCoordination = ct_researchnetworks.researchnetwork_coordination VARCHAR(1024);
String[0..1] researchNetworkDescription = ct_researchnetwork.researchnetwork_description VARCHAR(4096); String[0..1] researchNetworkDescription = ct_researchnetworks.researchnetwork_description VARCHAR(4096);
String[0..1] researchNetworkWebsite = ct_researchnetwork.researchnetwork_website VARCHAR(512); String[0..1] researchNetworkWebsite = ct_researchnetworks.researchnetwork_website VARCHAR(512);
reference key (ct_researchnetworks.researchnetwork_id); reference key (ct_researchnetworks.researchnetwork_id);
} }

View File

@ -21,15 +21,15 @@ import com.arsdigita.cms.ContentItem;
import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObject;
object type ResearchNetworkMembership extends 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); reference key(ct_researchnetworkmemberships.membership_id);
aggressive load (membershipOwner.id); aggressive load (membershipOwner.id);
} }
association { association {
composite ResearchNetwork[0..1] membershipOwner = join ct_researchnetworkmemberships.owner_id to ct_researchnetworks_researchnetwork_id; 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 ResearchNetworkMembership[0..n] members = join ct_researchnetworks.researchnetwork_id to ct_researchnetworkmemberships.owner_id;
} }
query getResearchNetworkMembershipsReferingToResearchNetworks { query getResearchNetworkMembershipsReferingToResearchNetworks {

View File

@ -15,9 +15,17 @@
labelBundle="com.arsdigita.cms.contenttypes.ResearchNetworkResources" labelBundle="com.arsdigita.cms.contenttypes.ResearchNetworkResources"
descriptionKey="researchnetwork.authoring.basic_properties.description" descriptionKey="researchnetwork.authoring.basic_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.ResearchnetworkResources" descriptionBundle="com.arsdigita.cms.contenttypes.ResearchnetworkResources"
component="com.arsdigita.cms.contenttypes.ui.researchnetwork.ResearchNetworkPropertiesStep" component="com.arsdigita.cms.contenttypes.ui.ResearchNetworkPropertiesStep"
ordering="1"/> ordering="1"/>
<ctd:authoring-step labelKey="researchnetwork.authoring.membership.title"
labelBundle="com.arsdigita.cms.contenttypes.ResearchNetworkResources"
descriptionKey="researchnetwork.authoring.membership.description"
descriptionBundle="com.arsdigita.cms.contenttypes.ResearchNetworkResources"
component="com.arsdigita.cms.contenttypes.ui.ResearchNetworkMembershipPropertiesStep"
ordering="2"/>
<ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/> <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
</ctd:authoring-kit> </ctd:authoring-kit>

View File

@ -8,7 +8,7 @@
</requires> </requires>
<provides> <provides>
<table name="ct_researchnetworks" /> <table name="ct_researchnetworks" />
<table name="ct_researchnetworkmembers" /> <table name="ct_researchnetworkmemberships" />
<initializer class="com.arsdigita.cms.contenttypes.ResearchNetworkInitializer"/> <initializer class="com.arsdigita.cms.contenttypes.ResearchNetworkInitializer"/>
</provides> </provides>
<scripts> <scripts>

View File

@ -27,8 +27,8 @@ import org.apache.log4j.Logger;
public class ResearchNetworkMembership extends ACSObject { public class ResearchNetworkMembership extends ACSObject {
private static final Logger s_log = Logger.getLogger(ResearchNetwork.class); 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 BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.ResearchNetworkMembership";
public static final String MEMBER_OWNER = "memberOwner"; public static final String MEMBER_OWNER = "membershipOwner";
public static final String TARGET_ITEM = "targetItem"; public static final String TARGET_ITEM = "targetItem";
public ResearchNetworkMembership() { public ResearchNetworkMembership() {

View File

@ -60,7 +60,7 @@ public class ResearchNetworkMembershipPropertiesStep extends ResettableContainer
return container; return container;
} }
public FormSection getEditSheet() { public FormSection getEditSheet() {
ResearchNetworkMembershipPropertyForm propertyForm = new ResearchNetworkMembershipPropertyForm(m_itemModel, m_membershipModel); ResearchNetworkMembershipPropertyForm propertyForm = new ResearchNetworkMembershipPropertyForm(m_itemModel, m_membershipModel);
propertyForm.setPropertiesStep(this); propertyForm.setPropertiesStep(this);
return propertyForm; return propertyForm;

View File

@ -16,7 +16,6 @@ import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.cms.SecurityManager; import com.arsdigita.cms.SecurityManager;
import com.arsdigita.cms.contenttypes.Membership;
import com.arsdigita.cms.contenttypes.Person; import com.arsdigita.cms.contenttypes.Person;
import com.arsdigita.cms.contenttypes.ResearchNetworkMembership; import com.arsdigita.cms.contenttypes.ResearchNetworkMembership;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;

View File

@ -6,6 +6,7 @@ import com.arsdigita.bebop.util.GlobalizationUtil;
import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentPage;
import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSection;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.ResearchNetwork;
import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ui.authoring.BasicPageForm;
import com.arsdigita.cms.ui.authoring.SimpleEditStep; import com.arsdigita.cms.ui.authoring.SimpleEditStep;
@ -39,6 +40,13 @@ public class ResearchNetworkPropertiesStep extends SimpleEditStep {
public static Component getResearchNetworkPropertySheet(ItemSelectionModel itemModel) { public static Component getResearchNetworkPropertySheet(ItemSelectionModel itemModel) {
DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(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()) { if (!ContentSection.getConfig().getHideLaunchDate()) {
sheet.add(GlobalizationUtil.globalize("cms.ui.authoring.page_launch_date"), ContentPage.LAUNCH_DATE, new DomainObjectPropertySheet.AttributeFormatter() { sheet.add(GlobalizationUtil.globalize("cms.ui.authoring.page_launch_date"), ContentPage.LAUNCH_DATE, new DomainObjectPropertySheet.AttributeFormatter() {