[OFBiz] SVN: r6470 - trunk/applications/content/widget/compdoc

[byersa@svn.ofbiz.org]

Author: byersa
Date: 2006-01-05 07:36:35 -0600 (Thu, 05 Jan 2006)
New Revision: 6470

Modified:
   trunk/applications/content/widget/compdoc/CompDocForms.xml
   trunk/applications/content/widget/compdoc/CompDocScreens.xml
Log:
Replacing ContentAssocViewFrom with Content.


Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml	2006-01-05 00:05:13 UTC (rev 6469)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml	2006-01-05 13:36:35 UTC (rev 6470)
@@ -26,13 +26,10 @@
     <!-- CompDoc forms -->
     <form name="FindCompDocTemplate" default-title-style="tableheadtext"
         default-tooltip-style="tabletext" default-widget-style="inputBox"
-        default-entity-name="ContentAssocViewFrom"
+        default-entity-name="Content"
         target="ListCompDocTemplate" title=" " type="single" > 
         <field name="contentName" title="Name" ><text-find/></field>
         <field name="contentId" title="Content Id" ><text-find/></field>
-        <field name="caFromDate" title="From Date" ><date-find/></field>
-        <field name="caThruDate" title="Thru Date" ><date-find/></field>
-        <field name="caContentIdTo" title="Publish-to content" ><text-find/></field>
         <field name="submitButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="addCompDocTemplate" title="">
             <hyperlink also-hidden="false" description="Create" target="EditCompDocTemplate"/> 

Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml	2006-01-05 00:05:13 UTC (rev 6469)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml	2006-01-05 13:36:35 UTC (rev 6470)
@@ -214,14 +214,12 @@
                     <decorator-section name="body">
                         <section>   
                             <actions>
-                                <entity-condition entity-name="ContentAssocViewFrom"  list-name="compDocFindList">
+                                <entity-condition entity-name="Content"  list-name="compDocFindList">
                                     <condition-list combine="and" >
-                                        <condition-expr field-name="contentName" operator="equals" env-name="contentName" ignore-if-empty="true"/>
-                                        <condition-expr field-name="contentId" operator="equals" env-name="contentId" ignore-if-empty="true"/>
-                                        <condition-expr field-name="caFromDate" operator="equals" env-name="caFromDate" ignore-if-empty="true"/>
-                                        <condition-expr field-name="caThruDate" operator="equals" env-name="caThruDate" ignore-if-empty="true"/>
-                                        <condition-expr field-name="caContentIdTo" operator="equals" env-name="caContentIdTo" ignore-if-empty="true"/>
-                                        <condition-expr field-name="contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>                  </condition-list>
+                                        <condition-expr field-name="contentName" operator="equals" env-name="parameters.contentName" ignore-if-empty="true"/>
+                                        <condition-expr field-name="contentId" operator="equals" env-name="parameters.contentId" ignore-if-empty="true"/>
+                                        <condition-expr field-name="contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>                  
+                                    </condition-list>
                                 </entity-condition>
                             </actions>                      
                             <widgets>
@@ -362,9 +360,6 @@
     </screen>
      <screen name="cDTreeLine">
         <section>
-            <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/content/prepseqno.bsh"/>
-            </actions>
             <widgets>
                 <container>
                     <label text="${contentName}[${contentId}]" style="responseheader" />