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

GenericOrganizationalUnit current status 

git-svn-id: https://svn.libreccm.org/ccm/trunk@473 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2010-07-12 09:43:33 +00:00
parent b049727f6c
commit 809e6d0c47
6 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ccm-cms/pdl/com/arsdigita/content-types/GenericOrganizationalUnit.pdl
View File

@ -24,28 +24,28 @@ import com.arsdigita.cms.ContentPage;
//PDL definition for a commons base type for orgnizations, departments, projects etc.
object type GenericOrganizationalUnit extends ContentPage {
String[0..1] orgaunit_name = cms_organizationalunit.name VARCHAR(256);
//String[0..1] orgaunit_name = cms_organizationalunit.name VARCHAR(256);
String[0..1] addendum = cms_organizationalunit.nameaddendum VARCHAR(512);
String[0..1] addendum = cms_organizationalunit.addendum VARCHAR(512);
reference key (cms_organizationalunits.organizationalunit_id);
reference key (cms_organizationalunit.organizationalunit_id);
}
//Parent <-> child relation organizationalunits to build department structures etc.
association {
GenericOrganizationalUnit[0..n] children = join cms_organizationalunits.organizationalunit_id
to cms_organizationalunit_organizationalunit_map.children_id,
join cms_organizationalunit_organizationalunit_map.parent_id
to cms_organizationalunits.organizationalunit_id;
GenericOrganizationalUnit[0..1] orgaunit_parent = join cms_organizationalunit.organizationalunit_id
to cms_organizationalunit_organizationalunit_map.orgaunit_children_id,
join cms_organizationalunit_organizationalunit_map.orgaunit_parent_id
to cms_organizationalunit.organizationalunit_id;
GenericOrganizationalUnit[0..1] parent = join cms_organizationalunits.organizationalunit_id
to cms_organizationalunit_organizationalunit_map.parent_id,
join cms_organizationalunit_organizationalunit_map.children_id
to cms_organizationalunits.organizationalunit_id;
GenericOrganizationalUnit[0..n] orgaunit_children = join cms_organizationalunit.organizationalunit_id
to cms_organizationalunit_organizationalunit_map.orgaunit_parent_id,
join cms_organizationalunit_organizationalunit_map.orgaunit_children_id
to cms_organizationalunit.organizationalunit_id;
//Link attribute, allows it to customize the order which the childs will be shown.
BigDecimal[0..1] order = cms_organizationalunits_organizationalunit_map.map_order INTEGER;
BigDecimal[0..1] orgaunit_children_order = cms_organizationalunit_organizationalunit_map.map_order INTEGER;
}
//Link for contact points.
@ -54,15 +54,15 @@ association {
GenericOrganizationalUnit[0..1] organizationalunit = join cms_contacts.contact_id
to cms_organizationalunit_contact_map.contact_id,
join cms_organizationalunit_contact_map.organizationalunit_id
to cms_organizationalunits.organizationalunit_id;
to cms_organizationalunit.organizationalunit_id;
GenericContact[0..n] contacts = join cms_organizationalunits.organizationalunit_id
GenericContact[0..n] contacts = join cms_organizationalunit.organizationalunit_id
to cms_organizationalunit_contact_map.organizationalunit_id,
join cms_organizationalunit_contact_map.contact_id
to cms_contacts.contact_id;
//Some link attributes.
String contact_type = cms_organizationalunit_contact_map.contact_type VARCHAR(100);
BigDecimal contact_order = cms_organizationalunits_contact_map.map_order INTEGER;
BigDecimal contact_order = cms_organizationalunit_contact_map.map_order INTEGER;
}

5
ccm-cms/src/WEB-INF/content-types/GenericOrganizationalUnit.xml
View File

@ -9,8 +9,9 @@
label="GenericOrganizationalUnit"
description="A generic content type for organizations and projects."
objectType="com.arsdigita.cms.contenttypes.GenericOrganizationalUnit"
class="com.arsdigita.cms.contenttypes.GenericOrganizationalUnit">
classname= "com.arsdigita.cms.contenttypes.GenericOrganizationalUnit"
isInternal="yes">
<ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
<ctd:authoring-step

20
ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnit.java
View File

@ -18,7 +18,6 @@
*/
package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentType;
import com.arsdigita.cms.ContentPage;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.persistence.DataCollection;
@ -33,13 +32,13 @@ import java.math.BigDecimal;
*/
public class GenericOrganizationalUnit extends ContentPage {
public final static String ORGAUNIT_NAME = "ORGAUNIT_NAME";
public final static String ADDENDUM = "ORGAUNIT_ADDENDUM";
//public final static String ORGAUNIT_NAME = "ORGAUNIT_NAME";
public final static String ADDENDUM = "ADDENDUM";
public final static String CONTACTS = "CONTACTS";
public final static String CONTACT_TYPE = "CONTACT_TYPE";
public final static String CONTACT_ORDER = "CONTACT_ORDER";
public final static String ORGAUNIT_CHILDREN = "CHILDREN";
public final static String CHILDREN_ORDER = "CHILDREN_ORDER";
public final static String ORGAUNIT_CHILDREN = "ORGAUNIT_CHILDREN";
public final static String ORGAUNIT_CHILDREN_ORDER = "ORGAUNIT_CHILDREN_ORDER";
public final static String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.GenericOrganizationalUnit";
public GenericOrganizationalUnit() {
@ -62,20 +61,20 @@ public class GenericOrganizationalUnit extends ContentPage {
super(type);
}
@Override
/*@Override
public void beforeSave() {
super.beforeSave();
Assert.exists(getContentType(), ContentType.class);
}
}*/
public String getOrgaUnitName() {
/*public String getOrgaUnitName() {
return (String) get(ORGAUNIT_NAME);
}
public void setOrgaUnitName(String orgaUnitName) {
set(ORGAUNIT_NAME, orgaUnitName);
}
}*/
public String getAddendum() {
return (String) get(ADDENDUM);
@ -116,7 +115,7 @@ public class GenericOrganizationalUnit extends ContentPage {
DataObject link = add(ORGAUNIT_CHILDREN, child);
link.set(CHILDREN_ORDER, BigDecimal.valueOf(getContacts().size()));
link.set(ORGAUNIT_CHILDREN_ORDER, BigDecimal.valueOf(getContacts().size()));
}
public void removeOrgaUnitChildren(GenericOrganizationalUnit child) {
@ -127,4 +126,5 @@ public class GenericOrganizationalUnit extends ContentPage {
public boolean hasOrgaUnitChildren() {
return !this.getOrgaUnitChildren().isEmpty();
}
}

2
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitAddChildForm.java
View File

@ -40,7 +40,7 @@ public class GenericOrganizationalUnitAddChildForm extends BasicItemForm {
@Override
protected void addWidgets() {
add(new Label((String) ContenttypesGlobalizationUtil.globalize("cms.contenttypes.ui.genericorgaunit.select_child").localize()));
this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType(GenericOrganizationalUnit.class.getName()));
this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType(GenericOrganizationalUnit.BASE_DATA_OBJECT_TYPE));
add(this.m_itemSearch);
}

2
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildTable.java
View File

@ -124,7 +124,7 @@ public class GenericOrganizationalUnitChildTable extends Table implements
case 0:
return m_childCollection.getChildrenOrder();
case 1:
return m_child.getOrgaUnitName();
return m_child.getName();
case 2:
return GlobalizationUtil.globalize("cms.ui.delete").localize();
default:

11
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertyForm.java
View File

@ -30,7 +30,8 @@ public class GenericOrganizationalUnitPropertyForm extends BasicPageForm
private final static Logger s_log = Logger.getLogger(GenericOrganizationalUnitPropertyForm.class);
private GenericOrganizationalUnitPropertiesStep m_step;
public static final String ORGAUNIT_NAME = GenericOrganizationalUnit.ORGAUNIT_NAME;
//public static final String NAME = GenericOrganizationalUnit.NAME;
//public static final String ORGAUNIT_NAME = GenericOrganizationalUnit.ORGAUNIT_NAME;
public static final String ADDENDUM = GenericOrganizationalUnit.ADDENDUM;
public static final String ID = "GenericOrgaUnit_edit";
@ -51,7 +52,7 @@ public class GenericOrganizationalUnitPropertyForm extends BasicPageForm
add(new Label(
(String) ContenttypesGlobalizationUtil.globalize("cms.contenttypes.ui.genericorganunit.name").localize()));
ParameterModel nameParam = new StringParameter(ORGAUNIT_NAME);
ParameterModel nameParam = new StringParameter(NAME);
TextField name = new TextField(nameParam);
add(name);
@ -76,8 +77,8 @@ public class GenericOrganizationalUnitPropertyForm extends BasicPageForm
GenericOrganizationalUnit orgaunit =
(GenericOrganizationalUnit) super.initBasicWidgets(fse);
data.put(ORGAUNIT_NAME, orgaunit.getOrgaUnitName());
data.put(ORGAUNIT_NAME, orgaunit.getAddendum());
data.put(NAME, orgaunit.getName());
data.put(ADDENDUM, orgaunit.getAddendum());
}
@Override
@ -89,7 +90,7 @@ public class GenericOrganizationalUnitPropertyForm extends BasicPageForm
if ((orgaunit != null)
&& getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) {
orgaunit.setOrgaUnitName((String) data.get(ORGAUNIT_NAME));
orgaunit.setName((String) data.get(NAME));
orgaunit.setAddendum((String) data.get(ADDENDUM));
orgaunit.save();