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

CT GenericOrganization und CT OrganizationUnit 

Korrekturen damit diese Typen mit den Basistypen funktionieren.

git-svn-id: https://svn.libreccm.org/ccm/trunk@446 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2010-05-27 08:15:00 +00:00
parent 24425a182e
commit eea7541ae5
18 changed files with 146 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-cms-types-genericorganization/application.xml
View File

@ -8,7 +8,6 @@
<ccm:dependencies> <ccm:dependencies>
<ccm:requires name="ccm-core" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
<ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
<ccm:requires name="ccm-cms-types-person" version="6.6.0" relation="ge"/>
<ccm:requires name="ccm-cms-types-organizationalunit" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-cms-types-organizationalunit" version="6.6.0" relation="ge"/>
</ccm:dependencies> </ccm:dependencies>
<ccm:directories> <ccm:directories>

3
ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl
View File

@ -19,10 +19,11 @@ model com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentItem;
import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObject;
import com.arsdigita.cms.basetypes.Person;
object type OrganizationRole extends ACSObject { object type OrganizationRole extends ACSObject {
String[1..1] roleName = ct_organizationroles.rolename VARCHAR(150); String[1..1] roleName = ct_organizationroles.rolename VARCHAR(150);
Person[0..1] targetItem = join ct_organizationroles.target_item_id to ct_persons.person_id; Person[0..1] targetItem = join ct_organizationroles.target_item_id to cms_persons.person_id;
Integer[0..1] roleOrder = ct_organizationroles.role_order INTEGER; Integer[0..1] roleOrder = ct_organizationroles.role_order INTEGER;

1
ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.load
View File

@ -4,7 +4,6 @@
<table name="acs_objects" /> <table name="acs_objects" />
<table name="cms_items" /> <table name="cms_items" />
<table name="ct_organizationalunits" /> <table name="ct_organizationalunits" />
<table name="ct_persons" />
<initializer class="com.arsdigita.cms.Initializer" /> <initializer class="com.arsdigita.cms.Initializer" />
</requires> </requires>
<provides> <provides>

16
ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/OrganizationRole.java
View File

@ -139,9 +139,9 @@ public class OrganizationRole extends ACSObject {
* *
* @return The person associated with the role. * @return The person associated with the role.
*/ */
public Person getTargetItem() { public com.arsdigita.cms.basetypes.Person getTargetItem() {
DataObject object = (DataObject) get(TARGETITEM); DataObject object = (DataObject) get(TARGETITEM);
return (Person) DomainObjectFactory.newInstance(object); return (com.arsdigita.cms.basetypes.Person) DomainObjectFactory.newInstance(object);
} }
/** /**
@ -149,7 +149,7 @@ public class OrganizationRole extends ACSObject {
* *
* @param item * @param item
*/ */
public void setTargetItem(Person item) { public void setTargetItem(com.arsdigita.cms.basetypes.Person item) {
setAssociation(TARGETITEM, item); setAssociation(TARGETITEM, item);
} }
@ -177,7 +177,7 @@ public class OrganizationRole extends ACSObject {
* @return The URI of the target item. * @return The URI of the target item.
*/ */
public String getURI(PageState s) { public String getURI(PageState s) {
Person item = getTargetItem(); com.arsdigita.cms.basetypes.Person item = getTargetItem();
if (item == null) { if (item == null) {
logger.error(getOID() + " is a link between an organization and a person, but the associated person is null"); logger.error(getOID() + " is a link between an organization and a person, but the associated person is null");
@ -196,7 +196,7 @@ public class OrganizationRole extends ACSObject {
* @param person * @param person
* @return All roles a person is associated with. * @return All roles a person is associated with.
*/ */
public static DataCollection getReferingRoles(Person person) { public static DataCollection getReferingRoles(com.arsdigita.cms.basetypes.Person person) {
Session session = SessionManager.getSession(); Session session = SessionManager.getSession();
DataCollection roles = session.retrieve(BASE_DATA_OBJECT_TYPE); DataCollection roles = session.retrieve(BASE_DATA_OBJECT_TYPE);
Filter filter = roles.addInSubqueryFilter("id", "com.arsdigita.cms.contenttypes.getRefferingRoles"); Filter filter = roles.addInSubqueryFilter("id", "com.arsdigita.cms.contenttypes.getRefferingRoles");
@ -308,9 +308,9 @@ public class OrganizationRole extends ACSObject {
return; return;
} }
Assert.isTrue(currentKey != null, methodName + " cannot be " + Assert.isTrue(currentKey != null, methodName + " cannot be "
"called on an object that is not currently in the " + + "called on an object that is not currently in the "
"list"); + "list");
int key = currentKey.intValue(); int key = currentKey.intValue();
logger.info(String.format("key = %d", key)); logger.info(String.format("key = %d", key));

5
ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/OrganizationRolePropertyForm.java
View File

@ -22,7 +22,6 @@ import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.GenericOrganization; import com.arsdigita.cms.contenttypes.GenericOrganization;
import com.arsdigita.cms.contenttypes.GenericOrganizationGlobalizationUtil; import com.arsdigita.cms.contenttypes.GenericOrganizationGlobalizationUtil;
import com.arsdigita.cms.contenttypes.OrganizationRole; import com.arsdigita.cms.contenttypes.OrganizationRole;
import com.arsdigita.cms.contenttypes.Person;
import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.ItemSearchWidget;
import com.arsdigita.util.Assert; import com.arsdigita.util.Assert;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
@ -88,7 +87,7 @@ public class OrganizationRolePropertyForm extends FormSection implements FormIni
* it to the constructor of the ItemSearchWidget. The ItemSearchWidget will only * it to the constructor of the ItemSearchWidget. The ItemSearchWidget will only
* display object of type Person or derivated types. * display object of type Person or derivated types.
*/ */
this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.contenttypes.Person")); this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.basetypes.Person"));
add(this.m_itemSearch); add(this.m_itemSearch);
} }
@ -182,7 +181,7 @@ public class OrganizationRolePropertyForm extends FormSection implements FormIni
FormData data = e.getFormData(); FormData data = e.getFormData();
role.setRolename((String) m_rolename.getValue(state)); role.setRolename((String) m_rolename.getValue(state));
role.setTargetItem((Person) data.get(ITEM_SEARCH)); role.setTargetItem((com.arsdigita.cms.basetypes.Person) data.get(ITEM_SEARCH));
role.save(); role.save();
} }

41
ccm-cms-types-organizationalunit/application.xml
View File

@ -1,24 +1,23 @@
<?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-organizationalunit"
prettyName="Red Hat CCM Content Types" prettyName="Red Hat CCM Content Types"
version="6.6.0" version="6.6.0"
release="1" release="1"
webapp="ROOT"> webapp="ROOT">
<ccm:dependencies> <ccm:dependencies>
<ccm:requires name="ccm-core" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
<ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
<ccm:requires name="ccm-cms-types-person" version="6.6.0" relation="ge"/> </ccm:dependencies>
</ccm:dependencies> <ccm:directories>
<ccm:directories> <ccm:directory name="pdl"/>
<ccm:directory name="pdl"/> <ccm:directory name="sql"/>
<ccm:directory name="sql"/> <ccm:directory name="src"/>
<ccm:directory name="src"/> </ccm:directories>
</ccm:directories> <ccm:contacts>
<ccm:contacts> <ccm:contact uri="mailto:ccm@barkhof.uni-bremen.de" type="support"/>
<ccm:contact uri="mailto:ccm@barkhof.uni-bremen.de" type="support"/> </ccm:contacts>
</ccm:contacts> <ccm:description>
<ccm:description> Content type for representing organizational units.
Content type for representing organizational units. </ccm:description>
</ccm:description>
</ccm:application> </ccm:application>

3
ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/Membership.pdl
View File

@ -19,12 +19,13 @@ model com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentItem;
import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObject;
import com.arsdigita.cms.basetypes.Person;
object type Membership extends ACSObject { object type Membership extends ACSObject {
MembershipStatus[1..1] status = join ct_memberships.status_id to ct_membershipstatus.status_id; MembershipStatus[1..1] status = join ct_memberships.status_id to ct_membershipstatus.status_id;
Date[0..1] memberFrom = ct_memberships.member_from DATE; Date[0..1] memberFrom = ct_memberships.member_from DATE;
Date[0..1] memberTo = ct_memberships.member_to DATE; Date[0..1] memberTo = ct_memberships.member_to DATE;
Person[0..1] targetItem = join ct_memberships.target_item_id to ct_persons.person_id; Person[0..1] targetItem = join ct_memberships.target_item_id to cms_persons.person_id;
reference key(ct_memberships.membership_id); reference key(ct_memberships.membership_id);
aggressive load (membershipOwner.id); aggressive load (membershipOwner.id);

9
ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl
View File

@ -22,6 +22,7 @@ model com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentItem; 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;
import com.arsdigita.cms.basetypes.Person;
object type OrganizationalUnit extends ContentPage { object type OrganizationalUnit extends ContentPage {
String[0..1] organizationalunitName = ct_organizationalunits.organizationalunit_name VARCHAR(512); String[0..1] organizationalunitName = ct_organizationalunits.organizationalunit_name VARCHAR(512);
@ -37,12 +38,12 @@ object type OrganizationalUnit extends ContentPage {
association { association {
Person[0..1] direction = join ct_organizationalunits.direction_id to ct_persons.person_id; Person[0..1] direction = join ct_organizationalunits.direction_id to cms_persons.person_id;
OrganizationalUnit[0..n] directedUnit = join ct_persons.person_id to ct_organizationalunits.direction_id; OrganizationalUnit[0..n] directedUnit = join cms_persons.person_id to ct_organizationalunits.direction_id;
} }
association { association {
Person[0..1] assistentDirection = join ct_organizationalunits.assistantDirection_id to ct_persons.person_id; Person[0..1] assistentDirection = join ct_organizationalunits.assistantDirection_id to cms_persons.person_id;
OrganizationalUnit[0..n] assistenedDirectedUnit = join ct_persons.person_id to ct_organizationalunits.assistantDirection_id; OrganizationalUnit[0..n] assistenedDirectedUnit = join cms_persons.person_id to ct_organizationalunits.assistantDirection_id;
} }

102
ccm-cms-types-organizationalunit/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml
View File

@ -1,63 +1,63 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" <ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd"> xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
<ctd:content-type label="OrganizationalUnit" <ctd:content-type label="OrganizationalUnit"
description="Organizational Unit" description="Organizational Unit"
objectType="com.arsdigita.cms.contenttypes.OrganizationalUnit" objectType="com.arsdigita.cms.contenttypes.OrganizationalUnit"
classname="com.arsdigita.cms.contenttypes.OrganizationalUnit"> classname="com.arsdigita.cms.contenttypes.OrganizationalUnit">
<ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
<ctd:authoring-step labelKey="organizationalunit.authoring.basic_properties.title"
labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
descriptionKey="organizationalunit.authoring.basic_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
component="com.arsdigita.cms.contenttypes.ui.organizationalunit.OrganizationalUnitPropertiesStep"
ordering="1"/>
<ctd:authoring-step labelKey="organizationalunit.authoring.chooseDirector.title" <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
descriptionKey="organizationalunit.authoring.chooseDirector_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
component="com.arsdigita.cms.contenttypes.ui.organizationalunit.OrganizationalUnitChooseDirectorStep"
ordering="2"/>
<ctd:authoring-step labelKey="organizationalunit.authoring.chooseAssistentDirector.title" <ctd:authoring-step labelKey="organizationalunit.authoring.basic_properties.title"
labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources" labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
descriptionKey="organizationalunit.authoring.chooseAssistentDirector_properties.description" descriptionKey="organizationalunit.authoring.basic_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources" descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
component="com.arsdigita.cms.contenttypes.ui.organizationalunit.OrganizationalUnitChooseAssistentDirectorStep" component="com.arsdigita.cms.contenttypes.ui.organizationalunit.OrganizationalUnitPropertiesStep"
ordering="3"/> ordering="1"/>
<ctd:authoring-step labelKey="organizationalunit.authoring.subunits.title"
labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
descriptionKey="organizationalunit.authoring.subunits_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
component="com.arsdigita.cms.contenttypes.ui.organizationalunit.OrgaUnit2OrgaUnitPropertiesStep"
ordering="4"/>
<ctd:authoring-step labelKey="organizationalunit.authoring.members.title" <ctd:authoring-step labelKey="organizationalunit.authoring.chooseDirector.title"
labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources" labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
descriptionKey="organizationalunit.authoring.members_properties.description" descriptionKey="organizationalunit.authoring.chooseDirector_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources" descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
component="com.arsdigita.cms.contenttypes.ui.organizationalunit.MembershipPropertiesStep" component="com.arsdigita.cms.contenttypes.ui.organizationalunit.OrganizationalUnitChooseDirectorStep"
ordering="5"/> ordering="2"/>
<ctd:authoring-step labelKey="organizationalunit.authoring.membershipstatus.title" <ctd:authoring-step labelKey="organizationalunit.authoring.chooseAssistentDirector.title"
labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources" labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
descriptionKey="organizationalunit.authoring.membershipstatus_properties.description" descriptionKey="organizationalunit.authoring.chooseAssistentDirector_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources" descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
component="com.arsdigita.cms.contenttypes.ui.organizationalunit.MembershipStatusPropertiesStep" component="com.arsdigita.cms.contenttypes.ui.organizationalunit.OrganizationalUnitChooseAssistentDirectorStep"
ordering="6"/> ordering="3"/>
<ctd:authoring-step labelKey="organizationalunit.authoring.subunits.title"
<ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/> labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
</ctd:authoring-kit> descriptionKey="organizationalunit.authoring.subunits_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
component="com.arsdigita.cms.contenttypes.ui.organizationalunit.OrgaUnit2OrgaUnitPropertiesStep"
ordering="4"/>
<ctd:authoring-step labelKey="organizationalunit.authoring.members.title"
labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
descriptionKey="organizationalunit.authoring.members_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
component="com.arsdigita.cms.contenttypes.ui.organizationalunit.MembershipPropertiesStep"
ordering="5"/>
<ctd:authoring-step labelKey="organizationalunit.authoring.membershipstatus.title"
labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
descriptionKey="organizationalunit.authoring.membershipstatus_properties.description"
descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
component="com.arsdigita.cms.contenttypes.ui.organizationalunit.MembershipStatusPropertiesStep"
ordering="6"/>
<ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
</ctd:authoring-kit>
</ctd:content-type>
</ctd:content-type>
</ctd:content-types> </ctd:content-types>

46
ccm-cms-types-organizationalunit/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml
View File

@ -1,31 +1,31 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xrd:adapters xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules" <xrd:adapters xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd"> xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
<xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"> <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
<xrd:adapter objectType="com.arsdigita.cms.contenttypes.OrganizationalUnit" <xrd:adapter objectType="com.arsdigita.cms.contenttypes.OrganizationalUnit"
extends="com.arsdigita.cms.ContentPage"> extends="com.arsdigita.cms.ContentPage">
<xrd:associations rule="exclude"> <xrd:associations rule="exclude">
<xrd:property name="/object/subunits/direction"/> <xrd:property name="/object/subunits/direction"/>
<xrd:property name="/object/subunits/assistentDirection"/> <xrd:property name="/object/subunits/assistentDirection"/>
<xrd:property name="/object/membership/memberFrom"/> <xrd:property name="/object/membership/memberFrom"/>
<xrd:property name="/object/membership/memberTo"/> <xrd:property name="/object/membership/memberTo"/>
</xrd:associations> </xrd:associations>
<xrd:associations rule="include"> <xrd:associations rule="include">
<xrd:property name="/object/direction"/> <xrd:property name="/object/direction"/>
<xrd:property name="/object/assistentDirection"/> <xrd:property name="/object/assistentDirection"/>
<xrd:property name="/object/memberships"/> <xrd:property name="/object/memberships"/>
<xrd:property name="/object/memberships/status"/> <xrd:property name="/object/memberships/status"/>
<xrd:property name="/object/memberships/targetItem"/> <xrd:property name="/object/memberships/targetItem"/>
<xrd:property name="/object/subunits"/> <xrd:property name="/object/subunits"/>
<xrd:property name="/object/subunits/targetItem"/> <xrd:property name="/object/subunits/targetItem"/>
</xrd:associations> </xrd:associations>
</xrd:adapter> </xrd:adapter>
</xrd:context> </xrd:context>
</xrd:adapters> </xrd:adapters>

1
ccm-cms-types-organizationalunit/src/ccm-cms-types-organizationalunit.load
View File

@ -3,7 +3,6 @@
<table name="inits" /> <table name="inits" />
<table name="acs_objects" /> <table name="acs_objects" />
<table name="cms_items" /> <table name="cms_items" />
<table name="ct_persons" />
<initializer class="com.arsdigita.cms.Initializer" /> <initializer class="com.arsdigita.cms.Initializer" />
</requires> </requires>
<provides> <provides>

17
ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/Membership.java
View File

@ -2,6 +2,7 @@ package com.arsdigita.cms.contenttypes;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSection;
import com.arsdigita.cms.basetypes.Person;
import com.arsdigita.cms.dispatcher.ItemResolver; import com.arsdigita.cms.dispatcher.ItemResolver;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObject;
@ -117,21 +118,21 @@ public class Membership extends ACSObject {
public void setMembershipOwner(OrganizationalUnit ou) { public void setMembershipOwner(OrganizationalUnit ou) {
Assert.exists(ou, OrganizationalUnit.class); Assert.exists(ou, OrganizationalUnit.class);
logger.debug("Setting membership owner to " + ou.getOrganizationalUnitName()); logger.debug("Setting membership owner to " + ou.getOrganizationalUnitName());
setAssociation(MEMBERSHIP_OWNER, ou); setAssociation(MEMBERSHIP_OWNER, ou);
} }
public Member getTargetItem() { public Person getTargetItem() {
DataObject obj = (DataObject) get(TARGET_ITEM); DataObject obj = (DataObject) get(TARGET_ITEM);
return (Member) DomainObjectFactory.newInstance(obj); return (Person) DomainObjectFactory.newInstance(obj);
} }
public void setTargetItem(Member person) { public void setTargetItem(Person person) {
Assert.exists(person, Member.class); Assert.exists(person, Person.class);
setAssociation(TARGET_ITEM, person); setAssociation(TARGET_ITEM, person);
} }
public String getURI(PageState state) { public String getURI(PageState state) {
Member person = this.getTargetItem(); Person person = this.getTargetItem();
if (person == null) { if (person == null) {
logger.error(getOID() + " is a link between a OrganizationalUnit and a Person, but the associated Person is null"); logger.error(getOID() + " is a link between a OrganizationalUnit and a Person, but the associated Person is null");
@ -145,7 +146,7 @@ public class Membership extends ACSObject {
return URL.there(state.getRequest(), url).toString(); return URL.there(state.getRequest(), url).toString();
} }
public static DataCollection getReferingPersons(Member person) { public static DataCollection getReferingPersons(Person person) {
Session session = SessionManager.getSession(); Session session = SessionManager.getSession();
DataCollection memberships = session.retrieve(BASE_DATA_OBJECT_TYPE); DataCollection memberships = session.retrieve(BASE_DATA_OBJECT_TYPE);
Filter filter = memberships.addInSubqueryFilter("id", "com.arsdigita.cms.contenttypes.getReferingPersons"); Filter filter = memberships.addInSubqueryFilter("id", "com.arsdigita.cms.contenttypes.getReferingPersons");
@ -159,5 +160,5 @@ public class Membership extends ACSObject {
DataCollection dc = session.retrieve(BASE_DATA_OBJECT_TYPE); DataCollection dc = session.retrieve(BASE_DATA_OBJECT_TYPE);
dc.addEqualsFilter(MEMBERSHIP_OWNER + ".id", ou.getID()); dc.addEqualsFilter(MEMBERSHIP_OWNER + ".id", ou.getID());
return dc; return dc;
} }
} }

17
ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrganizationalUnit.java
View File

@ -19,6 +19,7 @@
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentPage;
import com.arsdigita.cms.basetypes.Person;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
@ -83,32 +84,32 @@ public class OrganizationalUnit extends ContentPage{
set(ORGANIZATIONALUNIT_DESCRIPTION, description); set(ORGANIZATIONALUNIT_DESCRIPTION, description);
} }
public Member getDirection() { public Person getDirection() {
DataObject dobj = (DataObject) get(DIRECTION); DataObject dobj = (DataObject) get(DIRECTION);
if (dobj != null) { if (dobj != null) {
return (Member) DomainObjectFactory.newInstance(dobj); return (Person) DomainObjectFactory.newInstance(dobj);
} else { } else {
return null; return null;
} }
} }
public void setDirection(Member person) { public void setDirection(Person person) {
logger.debug("Setting direction..."); logger.debug("Setting direction...");
Assert.exists(person, Member.class); Assert.exists(person, Person.class);
setAssociation(DIRECTION, person); setAssociation(DIRECTION, person);
} }
public Member getAssistentDirection() { public Person getAssistentDirection() {
DataObject dobj = (DataObject) get(ASSISTENT_DIRECTION); DataObject dobj = (DataObject) get(ASSISTENT_DIRECTION);
if (dobj != null) { if (dobj != null) {
return (Member) DomainObjectFactory.newInstance(dobj); return (Person) DomainObjectFactory.newInstance(dobj);
} else { } else {
return null; return null;
} }
} }
public void setAssistentDirection(Member person) { public void setAssistentDirection(Person person) {
Assert.exists(person, Member.class); Assert.exists(person, Person.class);
setAssociation(ASSISTENT_DIRECTION, person); setAssociation(ASSISTENT_DIRECTION, person);
} }

6
ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipPropertyForm.java
View File

@ -22,11 +22,11 @@ import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.util.GlobalizationUtil; import com.arsdigita.bebop.util.GlobalizationUtil;
import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentType;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.basetypes.Person;
import com.arsdigita.cms.contenttypes.Membership; import com.arsdigita.cms.contenttypes.Membership;
import com.arsdigita.cms.contenttypes.MembershipStatus; import com.arsdigita.cms.contenttypes.MembershipStatus;
import com.arsdigita.cms.contenttypes.OrganizationalUnit; import com.arsdigita.cms.contenttypes.OrganizationalUnit;
import com.arsdigita.cms.contenttypes.OrganizationalUnitGlobalizationUtil; import com.arsdigita.cms.contenttypes.OrganizationalUnitGlobalizationUtil;
import com.arsdigita.cms.contenttypes.Member;
import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.ItemSearchWidget;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
@ -77,7 +77,7 @@ public class MembershipPropertyForm extends FormSection implements FormInitListe
logger.debug("adding widgets..."); logger.debug("adding widgets...");
add(new Label(OrganizationalUnitGlobalizationUtil.globalize("cms.contenttypes.ui.orgnizationalunit.membership.Person"))); add(new Label(OrganizationalUnitGlobalizationUtil.globalize("cms.contenttypes.ui.orgnizationalunit.membership.Person")));
this.m_personSearch = new ItemSearchWidget(PERSON_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.contenttypes.Person")); this.m_personSearch = new ItemSearchWidget(PERSON_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.basetypes.Person"));
add(this.m_personSearch); add(this.m_personSearch);
add(new Label(OrganizationalUnitGlobalizationUtil.globalize("cms.contenttypes.ui.orgnizationalunit.membership.Status"))); add(new Label(OrganizationalUnitGlobalizationUtil.globalize("cms.contenttypes.ui.orgnizationalunit.membership.Status")));
@ -166,7 +166,7 @@ public class MembershipPropertyForm extends FormSection implements FormInitListe
PageState state = event.getPageState(); PageState state = event.getPageState();
FormData data = event.getFormData(); FormData data = event.getFormData();
membership.setTargetItem((Member) data.get(PERSON_SEARCH)); membership.setTargetItem((Person) data.get(PERSON_SEARCH));
MembershipStatus status = new MembershipStatus(new BigDecimal((String) this.m_status.getValue(state))); MembershipStatus status = new MembershipStatus(new BigDecimal((String) this.m_status.getValue(state)));
logger.debug("this.m_status.getValues() = " + this.m_status.getValue(state)); logger.debug("this.m_status.getValues() = " + this.m_status.getValue(state));

2
ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTableModelBuilder.java
View File

@ -6,12 +6,10 @@ import com.arsdigita.bebop.table.TableModel;
import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.bebop.table.TableModelBuilder;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.MembershipStatus; import com.arsdigita.cms.contenttypes.MembershipStatus;
import com.arsdigita.cms.contenttypes.MembershipStatusCollection;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.util.Assert;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;

4
ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipTable.java
View File

@ -16,10 +16,10 @@ import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.SecurityManager; import com.arsdigita.cms.SecurityManager;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.basetypes.Person;
import com.arsdigita.cms.contenttypes.Membership; import com.arsdigita.cms.contenttypes.Membership;
import com.arsdigita.cms.contenttypes.MembershipStatus; import com.arsdigita.cms.contenttypes.MembershipStatus;
import com.arsdigita.cms.contenttypes.OrganizationalUnitGlobalizationUtil; import com.arsdigita.cms.contenttypes.OrganizationalUnitGlobalizationUtil;
import com.arsdigita.cms.contenttypes.Member;
import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
@ -96,7 +96,7 @@ public class MembershipTable extends Table {
String url = membership.getURI(state); String url = membership.getURI(state);
if (column == m_personCol.getModelIndex()) { if (column == m_personCol.getModelIndex()) {
Member person = membership.getTargetItem(); Person person = membership.getTargetItem();
StringBuilder fullNameBuilder = new StringBuilder(); StringBuilder fullNameBuilder = new StringBuilder();
if(person.getTitlePre() != null) { if(person.getTitlePre() != null) {

10
ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseAssistentDirectorTable.java
View File

@ -32,9 +32,9 @@ import com.arsdigita.bebop.table.TableModel;
import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.bebop.table.TableModelBuilder;
import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.basetypes.Person;
import com.arsdigita.cms.contenttypes.OrganizationalUnit; import com.arsdigita.cms.contenttypes.OrganizationalUnit;
import com.arsdigita.cms.contenttypes.OrganizationalUnitGlobalizationUtil; import com.arsdigita.cms.contenttypes.OrganizationalUnitGlobalizationUtil;
import com.arsdigita.cms.contenttypes.Member;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.OID; import com.arsdigita.persistence.OID;
@ -78,7 +78,7 @@ public class OrganizationalUnitChooseAssistentDirectorTable extends Table implem
public TableModel makeModel(Table t, PageState s) { public TableModel makeModel(Table t, PageState s) {
t.getRowSelectionModel().clearSelection(s); t.getRowSelectionModel().clearSelection(s);
DataCollection m_persons = SessionManager.getSession().retrieve(Member.BASE_DATA_OBJECT_TYPE); DataCollection m_persons = SessionManager.getSession().retrieve(Person.BASE_DATA_OBJECT_TYPE);
m_persons.addEqualsFilter(ContentItem.VERSION, ContentItem.DRAFT); m_persons.addEqualsFilter(ContentItem.VERSION, ContentItem.DRAFT);
return new OrganizationalUnitChooseAssistentDirectorTableModel(t, m_persons); return new OrganizationalUnitChooseAssistentDirectorTableModel(t, m_persons);
} }
@ -88,7 +88,7 @@ public class OrganizationalUnitChooseAssistentDirectorTable extends Table implem
private Table m_table; private Table m_table;
private DataCollection m_persons; private DataCollection m_persons;
private Member m_person; private Person m_person;
private OrganizationalUnitChooseAssistentDirectorTableModel(Table t, DataCollection persons) { private OrganizationalUnitChooseAssistentDirectorTableModel(Table t, DataCollection persons) {
m_table = t; m_table = t;
@ -101,7 +101,7 @@ public class OrganizationalUnitChooseAssistentDirectorTable extends Table implem
public boolean nextRow() { public boolean nextRow() {
if (m_persons.next()) { if (m_persons.next()) {
m_person = (Member) DomainObjectFactory.newInstance(m_persons.getDataObject()); m_person = (Person) DomainObjectFactory.newInstance(m_persons.getDataObject());
return true; return true;
} else { } else {
return false; return false;
@ -163,7 +163,7 @@ public class OrganizationalUnitChooseAssistentDirectorTable extends Table implem
m_parent.showDisplayPane(state); m_parent.showDisplayPane(state);
BigDecimal personID = new BigDecimal (e.getRowKey().toString()); BigDecimal personID = new BigDecimal (e.getRowKey().toString());
OrganizationalUnit orgaunit = (OrganizationalUnit) this.m_selOrgaUnit.getSelectedObject(state); OrganizationalUnit orgaunit = (OrganizationalUnit) this.m_selOrgaUnit.getSelectedObject(state);
Member person = (Member) DomainObjectFactory.newInstance(new OID(Member.BASE_DATA_OBJECT_TYPE, personID)); Person person = (Person) DomainObjectFactory.newInstance(new OID(Person.BASE_DATA_OBJECT_TYPE, personID));
orgaunit.setAssistentDirection(person); orgaunit.setAssistentDirection(person);
} }
} }

10
ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseDirectorTable.java
View File

@ -32,8 +32,8 @@ import com.arsdigita.bebop.table.TableModel;
import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.bebop.table.TableModelBuilder;
import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.basetypes.Person;
import com.arsdigita.cms.contenttypes.OrganizationalUnit; import com.arsdigita.cms.contenttypes.OrganizationalUnit;
import com.arsdigita.cms.contenttypes.Member;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.OID; import com.arsdigita.persistence.OID;
@ -79,7 +79,7 @@ public class OrganizationalUnitChooseDirectorTable extends Table implements Tabl
public TableModel makeModel(Table t, PageState s) { public TableModel makeModel(Table t, PageState s) {
t.getRowSelectionModel().clearSelection(s); t.getRowSelectionModel().clearSelection(s);
DataCollection m_persons = SessionManager.getSession().retrieve(Member.BASE_DATA_OBJECT_TYPE); DataCollection m_persons = SessionManager.getSession().retrieve(Person.BASE_DATA_OBJECT_TYPE);
m_persons.addEqualsFilter(ContentItem.VERSION, ContentItem.DRAFT); m_persons.addEqualsFilter(ContentItem.VERSION, ContentItem.DRAFT);
return new OrganizationalUnitChooseDirectorTableModel(t, m_persons); return new OrganizationalUnitChooseDirectorTableModel(t, m_persons);
} }
@ -89,7 +89,7 @@ public class OrganizationalUnitChooseDirectorTable extends Table implements Tabl
private Table m_table; private Table m_table;
private DataCollection m_persons; private DataCollection m_persons;
private Member m_person; private Person m_person;
private OrganizationalUnitChooseDirectorTableModel(Table t, DataCollection persons) { private OrganizationalUnitChooseDirectorTableModel(Table t, DataCollection persons) {
m_table = t; m_table = t;
@ -102,7 +102,7 @@ public class OrganizationalUnitChooseDirectorTable extends Table implements Tabl
public boolean nextRow() { public boolean nextRow() {
if (m_persons.next()) { if (m_persons.next()) {
m_person = (Member) DomainObjectFactory.newInstance(m_persons.getDataObject()); m_person = (Person) DomainObjectFactory.newInstance(m_persons.getDataObject());
return true; return true;
} else { } else {
return false; return false;
@ -167,7 +167,7 @@ public class OrganizationalUnitChooseDirectorTable extends Table implements Tabl
m_parent.showDisplayPane(state); m_parent.showDisplayPane(state);
BigDecimal personID = new BigDecimal (e.getRowKey().toString()); BigDecimal personID = new BigDecimal (e.getRowKey().toString());
OrganizationalUnit orgaunit = (OrganizationalUnit) this.m_selOrgaUnit.getSelectedObject(state); OrganizationalUnit orgaunit = (OrganizationalUnit) this.m_selOrgaUnit.getSelectedObject(state);
Member person = (Member) DomainObjectFactory.newInstance(new OID(Member.BASE_DATA_OBJECT_TYPE, personID)); Person person = (Person) DomainObjectFactory.newInstance(new OID(Person.BASE_DATA_OBJECT_TYPE, personID));
orgaunit.setDirection(person); orgaunit.setDirection(person);
} }
} }