Most current version of GenericOrganization. Does not work, crashes when trying to add a function to an organization.

git-svn-id: https://svn.libreccm.org/ccm/trunk@178 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl

@@ -33,9 +33,9 @@ object type GenericOrganization extends ContentPage {
        reference key (ct_genericorganizations.organization_id);
 }
 
-object type OrganizationFunction extends ContentPage {
+object type OrganizationFunction extends ContentItem {
 
-       String[1..1] functionname = ct_organizationfunctions.name VARCHAR(256);
+       String[1..1] functionname = ct_organizationfunctions.functionname VARCHAR(256);
 
        reference key ( ct_organizationfunctions.function_id );
 }

ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml

@@ -18,9 +18,17 @@
 	  labelBundle="com.arsdigita.cms.contenttypes.GenericOrganizationResources"
 	  descriptionKey="genericorganization.authoring.basic_properties.description" 
 	  descriptionBundle="com.arsdigita.cms.contenttypes.GenericOrganizationResources"
-	  component="com.arsdigita.cms.contenttypes.ui.GenericOrganizationPropertiesStep" 
+	  component="com.arsdigita.cms.contenttypes.ui.genericOrganization.GenericOrganizationPropertiesStep" 
 	  ordering="1"/>
       
+      <ctd:authoring-step
+	  labelKey="genericorganization.authoring.functions.title"
+	  labelBundle="com.arsdigita.cms.contenttypes.GenericOrganizationResources"
+	  descriptionKey="genericorganization.authoring.functions.description" 
+	  descriptionBundle="com.arsdigita.cms.contenttypes.GenericOrganizationResources"
+	  component="com.arsdigita.cms.contenttypes.ui.genericOrganization.OrganizationFunctionPanel"
+	  ordering="2"/>
+
       <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
     </ctd:authoring-kit>
     

ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationInitializer.java

@@ -25,6 +25,7 @@ import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.domain.DomainObjectInstantiator;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.runtime.DomainInitEvent;
+import com.arsdigita.domain.SimpleDomainObjectTraversalAdapter;
 import org.apache.log4j.Logger;
 
 /**
@@ -54,4 +55,8 @@ public class GenericOrganizationInitializer extends ContentTypeInitializer {
 	return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xsl" };
     }
 
+    public String getTraversalXML() {
+    return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/GenericOrganization.xml";
+  }
+       
 }

ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/OrganizationFunction.java

@@ -9,6 +9,7 @@
 package com.arsdigita.cms.contenttypes;
 
 import com.arsdigita.cms.ContentPage;
+import com.arsdigita.cms.ContentItem;
 import com.arsdigita.domain.DomainObject;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.domain.DataObjectNotFoundException;
@@ -17,7 +18,7 @@ import java.math.BigDecimal;
 import org.apache.log4j.Logger;
 
 
-public class OrganizationFunction extends ContentPage {
+public class OrganizationFunction extends ContentItem {
     
     private static final Logger s_log = Logger.getLogger(OrganizationFunction.class);
 
@@ -45,6 +46,10 @@ public class OrganizationFunction extends ContentPage {
 	super(dataObject);
     }
 
+    public String getBaseDataObjectType() {
+	return BASE_DATA_OBJECT_TYPE;
+    }
+
     //Accessors
     public String getFunctionName() {
 	return (String)get(FUNCTIONNAME);

ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/OrganizationFunctionCollection.java

@@ -22,7 +22,8 @@ public class OrganizationFunctionCollection extends DomainCollection {
     }
 
     public OrganizationFunction getOrganizationFunction() {
-	return (OrganizationFunction)getDomainObject();
+	//return (OrganizationFunction)getDomainObject();
+	return new OrganizationFunction(m_dataCollection.getDataObject());
     }
 
 }

ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/genericOrganization/GenericOrganizationPropertiesStep.java

@@ -16,8 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-
+package com.arsdigita.cms.contenttypes.ui.genericOrganization;
-package com.arsdigita.cms.contenttypes.ui;
 
 import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.PageState;

ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/genericOrganization/GenericOrganizationPropertyForm.java

@@ -17,7 +17,7 @@
  *
  */
 
-package com.arsdigita.cms.contenttypes.ui;
+package com.arsdigita.cms.contenttypes.ui.genericOrganization;
 
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.FormProcessException;