svn commit: r487467 - in /incubator/ofbiz/trunk/applications/content/widget/content: DataResourceForms.xml DataResourceScreens.xml

[jonesde]

Author: jonesde
Date: Thu Dec 14 22:54:27 2006
New Revision: 487467

URL: http://svn.apache.org/viewvc?view=rev&rev=487467
Log:
Some cleanups on the DataResource text edit pages, and fixed the Html one to actually populate the ElectronicText.textData instead of always leaving it blank

Modified:
    incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
    incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml

Modified: incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?view=diff&rev=487467&r1=487466&r2=487467
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Thu Dec 14 22:54:27 2006
@@ -395,18 +395,14 @@
     </form>
 
     <!-- ElectronicText forms -->
-    <form name="EditElectronicText" target="updateElectronicText" title="" type="single" default-map-name="currentValue"
+    <form name="EditElectronicText" target="updateElectronicText" title="" type="single" default-map-name="electronicText"
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <!--auto-fields-service service-name="updateElectronicText"/-->
         <actions>
-            <entity-one entity-name="ElectronicText" value-name="eText">
-                <field-map field-name="dataResourceId" env-name="parameters.dataResourceId" ></field-map>
-            </entity-one>
+            <entity-one entity-name="ElectronicText" value-name="electronicText"/>
         </actions>
         <field name="dataResourceId" title="" widget-style="buttontext"><display also-hidden="true"/></field>
-        <field name="textData" widget-style="buttontext">
-            <textarea cols="120" rows="24" default-value="${eText.textData}" />
-        </field>
+        <field name="textData" widget-style="buttontext"><textarea cols="120" rows="24"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="AddElectronicText" target="addElectronicText" title="" type="single"
@@ -425,11 +421,14 @@
         <field name="textData" id-name="textData"><textarea rows="24" cols="120"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="EditHtmlText" target="updateHtmlText" title="" type="single" default-map-name="currentValue"
+    <form name="EditHtmlText" target="updateHtmlText" title="" type="single" default-map-name="electronicText"
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <actions>
+            <entity-one entity-name="ElectronicText" value-name="electronicText"/>
+        </actions>
         <auto-fields-entity entity-name="ElectronicText"/>
         <field name="dataResourceId" title="" widget-style="buttontext"><display/></field>
-        <field name="textData" id-name="textData"><textarea rows="20" cols="120" visual-editor-enable="true"/></field>
+        <field name="textData" id-name="textData"><textarea cols="120" rows="20" visual-editor-enable="true"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 </forms>

Modified: incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?view=diff&rev=487467&r1=487466&r2=487467
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Thu Dec 14 22:54:27 2006
@@ -227,9 +227,7 @@
                 <set field="titleProperty" value="PageTitleEditElectronicText"/>
                 <set field="headerItem" value="DataResource"/>
                 <set field="tabButtonItem" value="editElectronicText"/>
-                <entity-one entity-name="DataResource" value-name="currentValue">
-                    <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
-                </entity-one>
+                <entity-one entity-name="DataResource" value-name="currentValue"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
@@ -309,9 +307,7 @@
                 <set field="titleProperty" value="PageTitleEditHtmlText"/>
                 <set field="headerItem" value="DataResource"/>
                 <set field="tabButtonItem" value="editHtmlText"/>
-                <entity-one entity-name="DataResource" value-name="currentValue">
-                    <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
-                </entity-one>
+                <entity-one entity-name="DataResource" value-name="currentValue"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">