[OFBiz] SVN: r6698 - in trunk/applications/content: servicedef webapp/content/WEB-INF widget/compdoc

[byersa@svn.ofbiz.org]

Author: byersa
Date: 2006-02-07 08:31:14 -0600 (Tue, 07 Feb 2006)
New Revision: 6698

Modified:
   trunk/applications/content/servicedef/services.xml
   trunk/applications/content/webapp/content/WEB-INF/controller.xml
   trunk/applications/content/widget/compdoc/CompDocForms.xml
Log:
Fixes to allow CompDoc parts to generate ContentRevisionItems correctly.


Modified: trunk/applications/content/servicedef/services.xml
===================================================================
--- trunk/applications/content/servicedef/services.xml	2006-02-07 06:17:14 UTC (rev 6697)
+++ trunk/applications/content/servicedef/services.xml	2006-02-07 14:31:14 UTC (rev 6698)
@@ -1322,6 +1322,7 @@
         <description>Create a CompDoc Template entity and associated ContentRevision/Item entities</description>
         <implements service="persistContentAndAssoc"/>
         <attribute name="contentRevisionSeqId" type="String" mode="OUT" optional="false"/>
+        <attribute name="rootTemplateContentId" type="String" mode="IN" optional="true"/>
         <attribute name="rootInstanceContentId" type="String" mode="INOUT" optional="true"/>
     </service>
 </services>

Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml	2006-02-07 06:17:14 UTC (rev 6697)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml	2006-02-07 14:31:14 UTC (rev 6698)
@@ -1054,6 +1054,12 @@
        <response name="success" type="view" value="EditChildCompDocTemplate"/>
        <response name="error" type="view" value="AddChildCompDocTemplate"/>
    </request-map>
+   <request-map uri="updateChildCompDocTemplate">
+       <security auth="true" https="true"/>
+        <event invoke="persistCompDoc"  path="" type="service"/>
+       <response name="success" type="view" value="EditChildCompDocTemplate"/>
+       <response name="error" type="view" value="EditChildCompDocTemplate"/>
+   </request-map>
    <request-map uri="genCompDocInstance">
        <security auth="true" https="true"/>
         <event invoke="genCompDocInstance"  path="" type="service"/>

Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml	2006-02-07 06:17:14 UTC (rev 6697)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml	2006-02-07 14:31:14 UTC (rev 6698)
@@ -43,10 +43,12 @@
         <field name="contentName" title="Name" ><text/></field>
         <field name="contentId" title="Content Id" ><text/></field>
         <field name="contentTypeId" title="Content Type Id">
-            <radio no-current-selected-key="COMPDOC_TEMPLATE">
-                <option key="COMPDOC_TEMPLATE" description="Template"/>             
-                <option key="COMPDOC_INSTANCE" description="Instance"/>             
-            </radio>
+            <drop-down no-current-selected-key="COMPDOC_TEMPLATE">
+                <option key="COMPDOC_TEMPLATE" description="Root Template"/>             
+                <option key="COMPDOC_INSTANCE" description="Root Instance"/>             
+                <option key="TEMPLATE" description="Template Child"/>             
+                <option key="DOCUMENT" description="Instance Child"/>             
+            </drop-down>
         </field>
         <!-- 
         <field name="rootonly" map-name="dummy" title="Root CompDocs Only" >
@@ -402,7 +404,7 @@
         <field name="contentName"><text/></field>
         <field name="contentTypeId" ><hidden value="TEMPLATE"/></field>
         <field name="caContentIdTo" title="ContentId To" ><display/></field>
-        <field name="caContentAssocTypeId" title="Content Assoc Type Id"  ><display /></field>
+        <field name="caContentAssocTypeId" title="Content Assoc Type Id"  ><display also-hidden="false"/></field>
         <field name="caFromDate" title="From Date" ><display/></field>
         <field name="caThruDate" title="Thru Date"   ><date-time/></field>
         <field name="caSequenceNum" title="Sequence Num"   ><text/></field>