svn commit: r1001086 - in /ofbiz/branches/jquery: applications/accounting/widget
Locked
svn commit: r1001086 - in /ofbiz/branches/jquery: applications/accounting/widget
 
|
Author: jleroux
Date: Fri Sep 24 21:32:46 2010 New Revision: 1001086 URL: http://svn.apache.org/viewvc?rev=1001086&view=rev Log: I forgot to change the asmselect variables in FormWidgetExampleScreens.xml Modified: ofbiz/branches/jquery/applications/accounting/widget/ap/InvoiceScreens.xml ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml ofbiz/branches/jquery/framework/common/webcommon/includes/setMultipleSelectJs.ftl ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml Modified: ofbiz/branches/jquery/applications/accounting/widget/ap/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ap/InvoiceScreens.xml?rev=1001086&r1=1001085&r2=1001086&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ap/InvoiceScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ap/InvoiceScreens.xml Fri Sep 24 21:32:46 2010 @@ -168,7 +168,7 @@ under the License. <set field="salesRepPartyList" type="List" from-field="parameters.partyIds"/> <script location="component://accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy"/> - <!-- asmslect parameters, must be prefixed by asm_ --> + <!-- asmslect parameters, must be prefixed by asm_ for setMultipleSelectJs.ftl --> <set field="asm_multipleSelectForm" value="CommissionRun"/> <set field="asm_multipleSelect" value="CommissionRun_partyId"/> <set field="asm_formSize" value="700"/> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1001086&r1=1001085&r2=1001086&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Fri Sep 24 21:32:46 2010 @@ -184,7 +184,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy"/> - <!-- asmslect parameters, must be prefixed by asm_ --> + <!-- asmslect parameters, must be prefixed by asm_ for setMultipleSelectJs.ftl --> <!--set field="asm_multipleSelectForm" value="addAdditionalPartyForm"/> <set field="asm_multipleSelect" value="additionalRoleTypeId"/> <set field="asm_formSize" value="700"/> 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=1001086&r1=1001085&r2=1001086&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/setMultipleSelectJs.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/setMultipleSelectJs.ftl Fri Sep 24 21:32:46 2010 @@ -19,10 +19,10 @@ under the License. <script type="text/javascript"> jQuery(document).ready(function() { -widget = jQuery("#${asm_multipleSelect}"); -ftl = jQuery("select[name='${asm_multipleSelect}']"); -isWidget = widget.length; -isFtl = ftl.length; + widget = jQuery("#${asm_multipleSelect?if_exists}"); + ftl = jQuery("select[name='${asm_multipleSelect?if_exists}']"); + isWidget = widget.length; + isFtl = ftl.length; <#if asm_title?exists> // set the dropdown "title" if exists @@ -33,16 +33,16 @@ isFtl = ftl.length; if (isWidget) { widget.asmSelect({ addItemTarget: 'top', - sortable: ${asm_sortable}, - removeLabel: '${uiLabelMap.CommonRemove}' + sortable: ${asm_sortable}!'false'}, + removeLabel: '${uiLabelMap.CommonRemove}!'Remove'}' }); } // use asmSelect in Freemarker Templates else if (isFtl) { ftl.asmSelect({ addItemTarget: 'top', - sortable: ${asm_sortable}, - removeLabel: '${uiLabelMap.CommonRemove}' + sortable: ${asm_sortable}!'false'}, + removeLabel: '${uiLabelMap.CommonRemove}!'Remove'}' //,debugMode: true }); } @@ -51,28 +51,21 @@ isFtl = ftl.length; // track possible relatedField changes // 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 - if (isWidget) { - jQuery("#${asm_relatedField}").bind('change focus', function() { - typeValue = jQuery('#${asm_typeField}').val(); - selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}'); - }); - } else if (isFtl) { - jQuery("#${asm_relatedField}").bind('change focus', function() { - typeValue = jQuery('#${asm_typeField}').val(); - selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}'); - }); - } + jQuery("#${asm_relatedField}").bind('change focus', function() { + typeValue = jQuery('#${asm_typeField}').val(); + selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}'); + }); </#if> }); </script> <style type="text/css"> #${asm_multipleSelectForm} { - width: ${asm_formSize}px; + width: ${asm_formSize!700}px; position: relative; } .asmListItem { - width: ${asm_asmListItemPercentOfForm}%; + width: ${asm_asmListItemPercentOfForm!95}%; } </style> \ No newline at end of file Modified: ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml?rev=1001086&r1=1001085&r2=1001086&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml Fri Sep 24 21:32:46 2010 @@ -65,12 +65,12 @@ under the License. <set field="descName" value="geoName"/> <set field="selectedDependentOption" from-field="postalAddress.stateProvinceGeoId" default-value="_none_"/><!-- postalAddress.stateProvinceGeoId does not make much sense here, only to get the idea --> - <!-- fields for setMultipleSelectJs.ftl --> - <set field="multipleSelectForm" value="DropDownMultipleFieldExampleForm"/> - <set field="multipleSelect" value="DropDownMultipleFieldExampleForm_countryGeoIdMultiple"/> - <set field="formSize" value="600"/> - <set field="asmListItemPercentOfForm" value="95"/> - <set field="sortable" value="false"/> + <!-- asmslect parameters, must be prefixed by asm_ for setMultipleSelectJs.ftl --> + <set field="asm_multipleSelectForm" value="DropDownMultipleFieldExampleForm"/> + <set field="asm_multipleSelect" value="DropDownMultipleFieldExampleForm_countryGeoIdMultiple"/> + <set field="asm_formSize" value="600"/> + <set field="asm_asmListItemPercentOfForm" value="95"/> + <set field="asm_sortable" value="false"/> </actions> <widgets> <!--platform-specific><html><html-template location="component://common/webcommon/includes/setCountryStatesEventJs.ftl"/></html></platform-specific--> Modified: ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml?rev=1001086&r1=1001085&r2=1001086&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml (original) +++ ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml Fri Sep 24 21:32:46 2010 @@ -101,7 +101,7 @@ <set field="noId" value="true"/><!-- see CommonGeoManagementDecorator --> - <!-- asmslect parameters, must be prefixed by asm_ --> + <!-- asmslect parameters, must be prefixed by asm_ for setMultipleSelectJs.ftl --> <set field="asm_multipleSelectForm" value="LinkGeos"/> <set field="asm_multipleSelect" value="LinkGeos_geoIds"/> <set field="asm_formSize" value="700"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |