svn commit: r1128804 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml widget/catalog/ProdCatalogForms.xml

[hansbak-2]

Author: hansbak
Date: Sun May 29 02:16:13 2011
New Revision: 1128804

URL: http://svn.apache.org/viewvc?rev=1128804&view=rev
Log:
small corrections on previous commit

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1128804&r1=1128803&r2=1128804&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun May 29 02:16:13 2011
@@ -4170,6 +4170,19 @@
         <value xml:lang="zh">产品目录分类类型标识</value>
         <value xml:lang="zh_TW">產品目錄分類類型ID</value>
     </property>
+    <property key="FormFieldTitle_prodCatalogName">
+        <value xml:lang="de">Katalogname</value>
+        <value xml:lang="en">Catalog Name</value>
+        <value xml:lang="es">Nombre de Catálogo</value>
+        <value xml:lang="fr">Nom du catalogue</value>
+        <value xml:lang="it">Nome catalogo</value>
+        <value xml:lang="nl">Catalogusnaam</value>
+        <value xml:lang="ro">Nume Catalog</value>
+        <value xml:lang="ru">Имя каталога</value>
+        <value xml:lang="th">ชื่อหมวดหมู่</value>
+        <value xml:lang="zh">目录名称</value>
+        <value xml:lang="zh_TW">目錄名稱</value>
+    </property>
     <property key="FormFieldTitle_prodSearchExcludeVariant">
         <value xml:lang="de">Produktsuche schliesst die Variante aus</value>
         <value xml:lang="en">Prod Search Exclude Variant</value>
@@ -10402,19 +10415,6 @@
         <value xml:lang="zh">这个应用程序主要用于维护产品目录相关信息</value>
         <value xml:lang="zh_TW">這個應用程式主要用于維護產品目錄相關資訊</value>
     </property>
-    <property key="ProductCatalogName">
-        <value xml:lang="de">Katalogname</value>
-        <value xml:lang="en">Catalog Name</value>
-        <value xml:lang="es">Nombre de Catálogo</value>
-        <value xml:lang="fr">Nom du catalogue</value>
-        <value xml:lang="it">Nome catalogo</value>
-        <value xml:lang="nl">Catalogusnaam</value>
-        <value xml:lang="ro">Nume Catalog</value>
-        <value xml:lang="ru">Имя каталога</value>
-        <value xml:lang="th">ชื่อหมวดหมู่</value>
-        <value xml:lang="zh">目录名称</value>
-        <value xml:lang="zh_TW">目錄名稱</value>
-    </property>
     <property key="ProductCatalogNameId">
         <value xml:lang="de">Katalogname [ID]</value>
         <value xml:lang="en">Catalog Name [Id]</value>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1128804&r1=1128803&r2=1128804&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml Sun May 29 02:16:13 2011
@@ -22,9 +22,8 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="FindCatalog" type="single" target="FindCatalog" title="" default-map-name="catalog"
         header-row-style="header-row" default-table-style="basic-table" >
-        <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="prodCatalogId" title="${uiLabelMap.ProdCatalogId}"><text-find/></field>
-        <field name="prodCatalogName" title="${uiLabelMap.FormFieldTitle_prodCatalogName}"><text-find/></field>
+        <field name="catalogName"><text-find/></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
@@ -34,8 +33,9 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
         <actions>
             <set field="entityName" value="ProdCatalog"/>
+            <set field="parameters.sortField" from-field="parameters.sortField" default-value="+catalogName"/>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
-                <field-map field-name="inputFields" from-field="requestParameters"/>
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" from-field="entityName"/>
                 <field-map field-name="orderBy" from-field="parameters.sortField"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
@@ -83,7 +83,7 @@ under the License.
         <!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
         <field use-when="prodCatalog==null&amp;&amp;prodCatalogId==null" name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}"><text size="20" maxlength="20"/></field>
 
-        <field name="catalogName" title="${uiLabelMap.ProductCatalogName}"><text size="30" maxlength="60"/></field>
+        <field name="catalogName"><text size="30" maxlength="60"/></field>
 
         <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}">
             <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>