svn commit: r929609 - /ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml

[lektran]

Author: lektran
Date: Wed Mar 31 16:22:23 2010
New Revision: 929609

URL: http://svn.apache.org/viewvc?rev=929609&view=rev
Log:
Consolidated two <if> blocks that were doing the same thing

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=929609&r1=929608&r2=929609&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Wed Mar 31 16:22:23 2010
@@ -213,18 +213,8 @@ under the License.
             <condition>
                 <or>
                     <if-compare field="persistMap.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
-                    <if-compare field="persistMap.contentTypeId" operator="equals" value="TEMPLATE"/>
-                </or>
-            </condition>
-            <then>
-                <!--  if no rootTemplateContentId exists, this must be a root op, so set contentId = itemContentId -->
-                <set from-field="pResults.contentId" field="revisionMap.contentId"/>
-            </then>
-        </if>
-        <if>
-            <condition>
-                <or>
                     <if-compare field="persistMap.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
+                    <if-compare field="persistMap.contentTypeId" operator="equals" value="TEMPLATE"/>
                     <if-compare field="persistMap.contentTypeId" operator="equals" value="DOCUMENT"/>
                 </or>
             </condition>