svn commit: r589550 - in /ofbiz/trunk/applications/content/widget/content: DataResourceMenus.xml DataResourceScreens.xml

[hansbak-2]

Author: hansbak
Date: Mon Oct 29 02:01:32 2007
New Revision: 589550

URL: http://svn.apache.org/viewvc?rev=589550&view=rev
Log:
 fix problem with new/existing edit dataresource button and fix category list on edit dataresource screen

Modified:
    ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?rev=589550&r1=589549&r2=589550&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Mon Oct 29 02:01:32 2007
@@ -81,11 +81,17 @@
         <menu-item name="navigateDataResource" title="${uiLabelMap.ContentNavigate}">
             <link target="navigateDataResource"/>
         </menu-item>
-        <menu-item name="editDataResource" title="${uiLabelMap.CommonNew}">
+        <menu-item name="editDataResource" title="${uiLabelMap.CommonEdit}">
             <condition>
-                <if-empty field-name="currentValue.dataResourceId"/>
+                <not><if-empty field-name="currentValue.dataResourceId"/></not>
             </condition>
             <link target="editDataResource?dataResourceId=${parameters.dataResourceId}"/>
+        </menu-item>
+        <menu-item name="newDataResource" title="${uiLabelMap.CommonNew}">
+            <condition>
+                <if-empty field-name="currentValue.dataResourceId"/>
+            </condition>
+            <link target="editDataResource"/>
         </menu-item>
         <menu-item name="editElectronicText" title="${uiLabelMap.ContentDataResourceText}" >
             <condition>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=589550&r1=589549&r2=589550&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Mon Oct 29 02:01:32 2007
@@ -124,6 +124,7 @@
                 <set field="tabButtonItem" value="editDataResource"/>
                 <set field="dataResourceId" from-field="parameters.dataResourceId"/>
                 <entity-one entity-name="DataResource" value-name="currentValue"/>
+                <entity-and entity-name="DataCategory" list-name="dataCategoryList"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">