svn commit: r930202 - in /ofbiz/trunk/applications: accounting/widget/AccountingTrees.xml content/script/org/ofbiz/content/content/ContentServices.xml content/script/org/ofbiz/content/data/DataServices.xml content/widget/compdoc/CompDocScreens.xml

[erwan]

Author: erwan
Date: Fri Apr  2 09:21:53 2010
New Revision: 930202

URL: http://svn.apache.org/viewvc?rev=930202&view=rev
Log:
Badly formed from-field values (mis-matched curly braces) OFBIZ-3631 (https://issues.apache.org/jira/browse/OFBIZ-3631)

Modified:
    ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml?rev=930202&r1=930201&r2=930202&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml Fri Apr  2 09:21:53 2010
@@ -54,7 +54,7 @@ under the License.
             </sub-node>
         </node>
         <node name="node-body">
-            <link target="EditFixedAsset" text="${fixedAssetId} ${fixedAssetName ${instanceOfProductId} ${fixedAssetTypeId} ">
+            <link target="EditFixedAsset" text="${fixedAssetId} ${fixedAssetName} ${instanceOfProductId} ${fixedAssetTypeId} ">
                 <parameter param-name="fixedAssetId" from-field="fixedAssetId"/>
             </link>
             <sub-node node-name="node-body">

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=930202&r1=930201&r2=930202&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Fri Apr  2 09:21:53 2010
@@ -734,7 +734,7 @@
             <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
         </entity-one>
         <if-empty field="dataResource">
-            <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error>
+            <add-error><fail-message message="No data resource found for ID: [${parameters.dataResourceId}]"/></add-error>
         </if-empty>
         <check-errors/>
 

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=930202&r1=930201&r2=930202&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Fri Apr  2 09:21:53 2010
@@ -645,7 +645,7 @@ under the License.
     <simple-method method-name="saveLocalFileDateResource" short-description="Attach an uploaded file to a data resource as LOCAL_FILE">
         <entity-one entity-name="DataResource" value-field="dataResource"/>
         <if-empty field="dataResource">
-            <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error>
+            <add-error><fail-message message="No data resource found for ID: [${parameters.dataResourceId}]"/></add-error>
         </if-empty>
         <if>
             <condition>
@@ -705,7 +705,7 @@ under the License.
             <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
         </entity-one>
         <if-empty field="dataResource">
-            <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error>
+            <add-error><fail-message message="No data resource found for ID: [${parameters.dataResourceId}]"/></add-error>
         </if-empty>
         <if>
             <condition>
@@ -761,7 +761,7 @@ under the License.
             <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
         </entity-one>
         <if-empty field="dataResource">
-            <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error>
+            <add-error><fail-message message="No data resource found for ID: [${parameters.dataResourceId}]"/></add-error>
         </if-empty>
         <if>
             <condition>
@@ -817,7 +817,7 @@ under the License.
             <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
         </entity-one>
         <if-empty field="dataResource">
-            <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error>
+            <add-error><fail-message message="No data resource found for ID: [${parameters.dataResourceId}]"/></add-error>
         </if-empty>
         <if>
             <condition>
@@ -873,7 +873,7 @@ under the License.
             <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
         </entity-one>
         <if-empty field="dataResource">
-            <add-error><fail-message message="No data resource found for ID: [$parameters.dataResourceId}]"/></add-error>
+            <add-error><fail-message message="No data resource found for ID: [${parameters.dataResourceId}]"/></add-error>
         </if-empty>
         <if>
             <condition>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=930202&r1=930201&r2=930202&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Fri Apr  2 09:21:53 2010
@@ -340,7 +340,7 @@ under the License.
                         <parameter param-name="rootTemplateContentId"/>
                         <parameter param-name="rootTemplateRevSeqId"/>
                         <parameter param-name="rootInstanceContentId"/>
-                        <parameter param-name="rootInstanceRevSeqId" from-field="rootInstanceRevSeqId}"/>
+                        <parameter param-name="rootInstanceRevSeqId" from-field="rootInstanceRevSeqId"/>
                       </link>
                             <link target="AddRootCompDocTemplate"  text="${ContentCreateNewRootCompDocTemplate}" style="buttontext">
                         <parameter param-name="contentId"/>