svn commit: r801590 - in /ofbiz/trunk/applications/content: config/ContentUiLabels.xml widget/content/DataResourceMenus.xml

[jacopoc]

Author: jacopoc
Date: Thu Aug  6 10:21:21 2009
New Revision: 801590

URL: http://svn.apache.org/viewvc?rev=801590&view=rev
Log:
The upload screen is now available to other binary data resource types, not only images. Tested also with PDF.

Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=801590&r1=801589&r2=801590&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Thu Aug  6 10:21:21 2009
@@ -573,6 +573,9 @@
         <value xml:lang="th">ตัวอักษร</value>
         <value xml:lang="zh">文本</value>
     </property>
+    <property key="ContentDataResourceUpload">
+        <value xml:lang="en">Upload</value>
+    </property>
     <property key="ContentDataSetup">
         <value xml:lang="ar">إعداد مورد المعلومات</value>
         <value xml:lang="de">Datenressource Konfiguration</value>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?rev=801590&r1=801589&r2=801590&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Thu Aug  6 10:21:21 2009
@@ -113,16 +113,12 @@
                 <parameter param-name="dataResourceId" from-field="parameters.dataResourceId"/>
             </link>
         </menu-item>
-        <menu-item name="uploadImage" title="${uiLabelMap.ContentDataResourceImage}" >
+        <menu-item name="uploadImage" title="${uiLabelMap.ContentDataResourceUpload}" >
             <condition>
                 <or>
                     <if-compare field="currentValue.dataResourceTypeId" operator="equals" value="IMAGE_OBJECT"/>
                     <and>
                         <if-compare field="currentValue.dataResourceTypeId" operator="contains" value="FILE"/>
-                        <or>
-                            <if-compare field="currentValue.mimeTypeId" operator="contains" value="image"/>
-                            <if-compare field="currentValue.mimeTypeId" operator="contains" value="Image"/>
-                        </or>
                     </and>
                 </or>
             </condition>