svn commit: r1000634 - in /ofbiz/branches/jquery/framework: common/config/ common/webcommon/includes/ example/config/ webtools/config/ webtools/webapp/webtools/WEB-INF/ webtools/widget/

Author: jleroux
Date: Thu Sep 23 21:29:22 2010
New Revision: 1000634

URL: http://svn.apache.org/viewvc?rev=1000634&view=rev
Log:
* Better French label (missed in last merge)
* Better independency from type field for setMultipleSelectJs.ftl
* Specialized LookupGeo for Edit Geo in Webtools
* Forgotten changes in GeoManagementForms.xml and GeoManagementScreens.xml

Modified:
    ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml
    ofbiz/branches/jquery/framework/common/webcommon/includes/setMultipleSelectJs.ftl
    ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml
    ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml
    ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml

Modified: ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml?rev=1000634&r1=1000633&r2=1000634&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml Thu Sep 23 21:29:22 2010
@@ -9447,7 +9447,7 @@
     </property>
     <property key="PageTitleLookupGeo">
         <value xml:lang="en">Lookup Geo</value>
-        <value xml:lang="fr">Consulter la zone géographique</value>
+        <value xml:lang="fr">Recherche une ou des zones géographiques</value>
         <value xml:lang="it">Ricerca Geografia</value>
         <value xml:lang="pt_BR">Buscar localização</value>
         <value xml:lang="ro">Cauta Geografia</value>

Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/setMultipleSelectJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/setMultipleSelectJs.ftl?rev=1000634&r1=1000633&r2=1000634&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/webcommon/includes/setMultipleSelectJs.ftl (original)
+++ ofbiz/branches/jquery/framework/common/webcommon/includes/setMultipleSelectJs.ftl Thu Sep 23 21:29:22 2010
@@ -31,7 +31,8 @@ under the License.
       // on initial focus or if the field value changes, select related multi values.
       // FIXME : not sure why focus does not work here, must be added as event/action in the multipleSelectForm.relatedField
       jQuery("#${relatedField}").bind('change focus', function() {
-        selectMultipleRelatedValues('${requestName}', '${paramKey}', '${relatedField}', '${multipleSelect}', '${type}', '${typeValue}', '${responseName}');
+        typeValue = jQuery('#${typeField}').val();
+        selectMultipleRelatedValues('${requestName}', '${paramKey}', '${relatedField}', '${multipleSelect}', '${type}', typeValue, '${responseName}');
       });
     }
   });

Modified: ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml?rev=1000634&r1=1000633&r2=1000634&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml Thu Sep 23 21:29:22 2010
@@ -738,7 +738,7 @@
     </property>
     <property key="PageTitleLookupExampleFeature">
         <value xml:lang="en">Lookup Example Feature</value>
-        <value xml:lang="fr">Consulter la caractéristique exemple</value>
+        <value xml:lang="fr">Rechercher une ou des caractéristiques exemple</value>
         <value xml:lang="it">Ricerca Caratteristica Esempio</value>
         <value xml:lang="ro">Cauta Caracteristica Exemplu</value>
         <value xml:lang="ru">Искать особенности примера</value>

Modified: ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml?rev=1000634&r1=1000633&r2=1000634&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml Thu Sep 23 21:29:22 2010
@@ -1512,12 +1512,12 @@
         <value xml:lang="zh">组名称</value>
     </property>
     <property key="WebtoolsGeoCreateNew">
-        <value xml:lang="en">Create New Geo</value>
-        <value xml:lang="fr">Créer une zone géographique</value>
+        <value xml:lang="en">Create/Edit Geo</value>
+        <value xml:lang="fr">Créer/Modifier une zone géographique</value>
     </property>
     <property key="WebtoolsGeoEdit">
-        <value xml:lang="en">Edit Geo</value>
-        <value xml:lang="fr">Modifier la zone géographique</value>
+        <value xml:lang="en">Create/Edit Geo</value>
+        <value xml:lang="fr">Créer/Modifier la zone géographique</value>
     </property>    
     <property key="WebtoolsGeoManagement">
         <value xml:lang="en">Geo Management</value>

Modified: ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1000634&r1=1000633&r2=1000634&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/controller.xml Thu Sep 23 21:29:22 2010
@@ -554,6 +554,7 @@ under the License.
     <request-map uri="FindGeo"><security https="true" auth="true"/><response name="success" type="view" value="FindGeo" save-home-view="true"/></request-map>
     <request-map uri="EditGeo"><security https="true" auth="true"/><response name="success" type="view" value="EditGeo"/></request-map>
     <request-map uri="LinkGeos"><security https="true" auth="true"/><response name="success" type="view" value="LinkGeos"/></request-map>
+    <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
     <request-map uri="createGeo">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="createGeo"/>
@@ -677,6 +678,7 @@ under the License.
     <view-map name="FindGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#FindGeo"/>
     <view-map name="EditGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#EditGeo"/>
     <view-map name="LinkGeos" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#LinkGeos"/>
+    <view-map name="LookupGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#LookupGeo"/>    
     
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml?rev=1000634&r1=1000633&r2=1000634&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml Thu Sep 23 21:29:22 2010
@@ -26,7 +26,7 @@
     <form name="ListGeos" extends-resource="component://common/widget/LookupForms.xml" extends="listLookupGeo" paginate-target="${currentUrl}"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true" >
         <field name="geoId"  widget-style="buttontext" title="${uiLabelMap.CommonGeoId}">
-            <hyperlink also-hidden="false" target-type="plain" description="${geoId}"  target="EditGeo">
+            <hyperlink also-hidden="false" target-type="plain" description="${geoId}"  target="LinkGeos">
                 <parameter param-name="geoId"/>
             </hyperlink>
         </field>
@@ -37,13 +37,12 @@
                 <parameter param-name="noConditionFind" value="Y"/>
             </hyperlink>
         </field>
-        <field name="noConditionFind"><hidden value="N"/></field>
     </form>
     
     <form name="EditGeo" type="single" target="updateGeo" title="" default-map-name="geo"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="geo==null" target="createGeo"/>
-        <field name="geoId" title="${uiLabelMap.CommonGeoId}"><text/></field>
+        <field name="geoId" title="${uiLabelMap.CommonGeoId}"><lookup target-form-name="LookupGeo"/></field>
         <field name="geoTypeId" title="${uiLabelMap.CommonGeoTypeId}">
             <drop-down allow-empty="true">
                 <entity-options key-field-name="geoTypeId" entity-name="GeoType" description="${description}">
@@ -59,8 +58,17 @@
 
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-
-    <form name="LinkGeos" type="single" target="linkGeos" title="" header-row-style="header-row" default-table-style="basic-table">
+    <form name="ListLookupGeo" extends="ListGeos">
+        <field name="geoId"  widget-style="buttontext" title="${uiLabelMap.CommonGeoId}">
+            <hyperlink also-hidden="false" target-type="plain" description="${geoId}"  target="EditGeo">
+                <parameter param-name="geoId"/>
+            </hyperlink>
+        </field>
+        <field name="deleteLink"><ignored/></field>        
+    </form>
+    
+    <form name="LinkGeos" type="single" target="linkGeos" title="" focus-field-name="geoId"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="geoIds" title="${uiLabelMap.CommonGeos}">
             <drop-down allow-multiple="true">
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
@@ -70,15 +78,19 @@
             </drop-down>
         </field>        
         <field name="dummy" title="${uiLabelMap.CommonEmptyHeader}" position="2"><display/></field>
-        <field name="geoAssocTypeId" title="${uiLabelMap.CommonGeoAssocTypeId}" position="3">
-            <drop-down allow-empty="true">
+        <field name="geoAssocTypeId" title="${uiLabelMap.CommonGeoAssocTypeId}" position="3"
+            event="onChange"
+            action="typeValue = jQuery('#${typeField}').val(); selectMultipleRelatedValues('${requestName}', '${paramKey}', '${relatedField}', '${multipleSelect}', '${type}', typeValue, '${responseName}');">
+            <drop-down>
                 <entity-options key-field-name="geoAssocTypeId" entity-name="GeoAssocType" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="geoId" title="${uiLabelMap.CommonGeo}">
-            <drop-down>
+        <field name="geoId" title="${uiLabelMap.CommonGeo}"
+            event="onFocus"
+            action="typeValue = jQuery('#${typeField}').val(); selectMultipleRelatedValues('${requestName}', '${paramKey}', '${relatedField}', '${multipleSelect}', '${type}', typeValue, '${responseName}');">                            
+            <drop-down current="selected">
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
                     <entity-order-by field-name="geoName"/>
                 </entity-options>

Modified: ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml?rev=1000634&r1=1000633&r2=1000634&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml Thu Sep 23 21:29:22 2010
@@ -68,6 +68,29 @@
             </widgets>
         </section>
     </screen>
+    <screen name="LookupGeo">
+        <section>
+            <actions>
+                <set field="title" value="${uiLabelMap.PageTitleLookupGeo}"/>
+                <set field="queryString" from-field="result.queryString"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+                <set field="entityName" value="Geo"/>
+                <set field="searchFields" value="[geoId, geoName]"/>
+                <set field="currentUrl" value="LookupGeo"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                    <decorator-section name="search-options">
+                        <include-form name="FindGeo" location="component://webtools/widget/GeoManagementForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListLookupGeo" location="component://webtools/widget/GeoManagementForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     
     <screen name="LinkGeos">
         <section>
@@ -78,16 +101,24 @@
                 
                 <set field="noId" value="true"/><!-- see CommonGeoManagementDecorator -->
                 
-                <set field="multipleSelect"  value="geoIds"/>
+                <!-- asmslect parameters -->
                 <set field="multipleSelectForm"  value="LinkGeos"/>
+                <set field="multipleSelect"  value="LinkGeos_geoIds"/>
                 <set field="formSize" value="422"/>
                 <set field="asmListItemPercentOfForm" value="95"/>
                 <set field="sortable" value="false"/>
+                <!-- selectMultipleRelatedValues parameters -->
+                <set field="relatedField" value="LinkGeos_geoId"/>
+                <set field="requestName" value="getRelatedGeos"/>                
+                <set field="paramKey" value="geoId"/>
+                <set field="type" value="geoAssocTypeId"/>
+                <set field="typeField" value="LinkGeos_geoAssocTypeId"/>
+                <set field="responseName" value="geoList"/>                
             </actions>
             <widgets>
                 <decorator-screen name="CommonGeoManagementDecorator" location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://common/webcommon/includes/setMutipleSelectJs.ftl"/></html></platform-specific>                            
+                        <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific>
                         <screenlet title="${uiLabelMap.WebtoolsGeosLinkExplained}">
                             <include-form name="LinkGeos" location="component://webtools/widget/GeoManagementForms.xml"/>
                         </screenlet>