svn commit: r989850 - in /ofbiz/branches/jquery: ./ applications/accounting/widget
Locked
svn commit: r989850 - in /ofbiz/branches/jquery: ./ applications/accounting/widget
 
|
Author: jleroux
Date: Thu Aug 26 17:58:41 2010 New Revision: 989850 URL: http://svn.apache.org/viewvc?rev=989850&view=rev Log: Merge the trunk at r989829 Added: ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.bridge_1.6.0.v200912221622.jar - copied unchanged from r989830, ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.bridge_1.6.0.v200912221622.jar ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.css_1.6.0.v200912221622.jar - copied unchanged from r989830, ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.css_1.6.0.v200912221622.jar ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.dom.svg_1.6.0.v200805290154.jar - copied unchanged from r989830, ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.dom.svg_1.6.0.v200805290154.jar ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.dom_1.6.0.v200912221622.jar - copied unchanged from r989830, ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.dom_1.6.0.v200912221622.jar ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.transcoder_1.6.0.v200805290154.jar - copied unchanged from r989830, ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.transcoder_1.6.0.v200805290154.jar ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.util_1.6.0.v200805290154.jar - copied unchanged from r989830, ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.util_1.6.0.v200805290154.jar Removed: ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.bridge/ ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.css/ ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.dom/ ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.dom.svg/ ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.transcoder/ ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.apache.batik.util/ Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/LICENSE ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml ofbiz/branches/jquery/applications/accounting/widget/TransactionForms.xml ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy ofbiz/branches/jquery/applications/order/widget/ordermgr/RequirementForms.xml ofbiz/branches/jquery/applications/party/widget/partymgr/PartyVisitForms.xml ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml ofbiz/branches/jquery/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 26 17:58:41 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-988870,989031 +/ofbiz/trunk:951708-989830 Modified: ofbiz/branches/jquery/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/LICENSE?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/LICENSE (original) +++ ofbiz/branches/jquery/LICENSE Thu Aug 26 17:58:41 2010 @@ -2366,6 +2366,12 @@ ofbiz/trunk/framework/birt/lib/odadesign ofbiz/trunk/framework/birt/lib/saaj.jar ofbiz/trunk/framework/birt/lib/scriptapi.jar ofbiz/trunk/framework/birt/lib/viewservlets.jar +ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.css_1.6.0.v200912221622.jar +ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.util_1.6.0.v200805290154.jar +ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.transcoder_1.6.0.v200805290154.jar +ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.dom.svg_1.6.0.v200805290154.jar +ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.bridge_1.6.0.v200912221622.jar +ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.dom_1.6.0.v200912221622.jar ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.xml.resolver_1.2.0.v201005080400.jar ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.xml.serializer_2.7.1.v201005080400.jar ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.api_1.0.0.jar Modified: ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml Thu Aug 26 17:58:41 2010 @@ -24,7 +24,6 @@ under the License. <form name="FindInvoices" type="single" target="findInvoices" title="Find and list invoices" 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="hideSearch"><hidden value="Y"/></field> <field name="invoiceId"><text-find ignore-case="true"/></field> <field name="description"><text-find ignore-case="true"/></field> <field position="1" name="invoiceTypeId"> Modified: ofbiz/branches/jquery/applications/accounting/widget/TransactionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/TransactionForms.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/TransactionForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/TransactionForms.xml Thu Aug 26 17:58:41 2010 @@ -22,7 +22,6 @@ under the License. <!-- form whose input filters the ListGatewayResponses --> <form name="FindGatewayResponses" type="single" target="FindGatewayResponses" title="" header-row-style="header-row" default-table-style="basic-table"> - <field name="hideSearch"><hidden value="Y"/></field> <!-- what is this for? --> <field name="paymentGatewayResponseId" title="${uiLabelMap.AccountingPaymentGatewayResponseId}"> <text-find/> </field> Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java Thu Aug 26 17:58:41 2010 @@ -156,7 +156,7 @@ public class ContentWorker implements or if (partyId != null && roleTypeId != null) { List<GenericValue> alternateViews = null; try { - alternateViews = content.getRelated("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_ROLE"), UtilMisc.toList("-caFromDate")); + alternateViews = content.getRelatedCache("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_ROLE"), UtilMisc.toList("-caFromDate")); } catch (GenericEntityException e) { Debug.logError(e, "Error finding alternate content: " + e.toString(), module); } Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Thu Aug 26 17:58:41 2010 @@ -67,6 +67,7 @@ if (productionRunId) { productionRunData = [:]; productionRunData.workEffortId = productionRunId; productionRunData.productId = productionRun.getProductProduced().productId; + productionRunData.product = productionRun.getProductProduced(); if (maxQuantity > 0 && !"WIP".equals(productionRun.getProductProduced().productTypeId)) { productionRunData.quantity = maxQuantity; context.canProduce = "Y"; Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Thu Aug 26 17:58:41 2010 @@ -18,8 +18,8 @@ under the License. --> <#escape x as x?xml> <#if productionRunId?has_content> - <fo:block space-after.optimum="0.3cm">${uiLabelMap.ManufacturingProductionRunId}: ${productionRunData.workEffortId?if_exists}</fo:block> - <fo:block space-after.optimum="1.0cm">${uiLabelMap.ProductProductId}: ${productionRunData.productId?if_exists}/${productionRunData.productName?if_exists}</fo:block> + <fo:block>${uiLabelMap.ManufacturingProductionRunId}: ${productionRunData.workEffortId?if_exists}<#if productionRunData.productionRunName?exists> / ${productionRunData.productionRunName}</#if></fo:block> + <fo:block space-after.optimum="0.2cm">${uiLabelMap.ProductProductId}: ${productionRunData.productId?if_exists}<#if productionRunData.product.productName?exists> / ${productionRunData.product.productName}</#if></fo:block> <#assign dimColor = "#D4D0C8"> <fo:table> <fo:table-column column-width="4.0cm"/> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Thu Aug 26 17:58:41 2010 @@ -23,7 +23,6 @@ under the License. <!-- Routing forms --> <form name="FindRoutings" type="single" target="FindRouting" title="" header-row-style="header-row" default-table-style="basic-table"> - <field name="hideSearch"><hidden value="Y"/></field> <field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingId}"> <text-find/> </field> @@ -71,7 +70,6 @@ under the License. <!-- Routing Task Forms --> <form name="FindRoutingTasks" type="single" target="FindRoutingTask" title="" header-row-style="header-row" default-table-style="basic-table"> - <field name="hideSearch"><hidden value="Y"/></field> <field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTaskId}"> <text-find/> </field> Modified: ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml Thu Aug 26 17:58:41 2010 @@ -1872,15 +1872,6 @@ <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¹à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value> <value xml:lang="zh">æ¥æ¾èç³»å表</value> </property> - <property key="PageTitleLookupGeo"> - <value xml:lang="en">Lookup Geo</value> - <value xml:lang="fr">Consulter la zone géographique</value> - <value xml:lang="it">Ricerca Geografia</value> - <value xml:lang="pt_BR">Buscar localização</value> - <value xml:lang="ro">Cauta Geografia</value> - <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¸£à¸à¸ªà¸£à¹à¸²à¸</value> - <value xml:lang="zh">æ¥æ¾å°ç</value> - </property> <property key="PageTitleLookupSalesForecast"> <value xml:lang="de">Verkaufsprognosen anschauen</value> <value xml:lang="en">Lookup Sales Forecast</value> Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy Thu Aug 26 17:58:41 2010 @@ -146,7 +146,7 @@ if (reviews) { } // an example of getting features of a certain type to show -sizeProductFeatureAndAppls = delegator.findByAnd("ProductFeatureAndAppl", [productId : productId, productFeatureTypeId : "SIZE"], ["sequenceNum", "defaultSequenceNum"]); +sizeProductFeatureAndAppls = delegator.findByAndCache("ProductFeatureAndAppl", [productId : productId, productFeatureTypeId : "SIZE"], ["sequenceNum", "defaultSequenceNum"]); context.product = product; context.categoryId = categoryId; Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/RequirementForms.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/RequirementForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/RequirementForms.xml Thu Aug 26 17:58:41 2010 @@ -23,7 +23,6 @@ under the License. <form name="FindRequirements" type="single" target="FindRequirements" title="" 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="hideSearch"><hidden value="Y"/></field> <field name="requirementId"><text-find/></field> <field name="requirementTypeId"> <drop-down allow-empty="true"> @@ -213,7 +212,6 @@ under the License. </form> <form name="FindNotApprovedRequirements" type="single" target="ApproveRequirements" title="" header-row-style="header-row" default-table-style="basic-table"> - <field name="hideSearch"><hidden value="Y"/></field> <field name="requirementId"><text-find/></field> <field name="requirementTypeId"> <drop-down allow-empty="true"> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyVisitForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyVisitForms.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyVisitForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyVisitForms.xml Thu Aug 26 17:58:41 2010 @@ -24,7 +24,6 @@ under the License. <form name="FindVisits" type="single" target="findVisits" title="Find and list party visits" 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="hideSearch"><hidden value="Y"/></field> <field name="activeOnly"><check /></field> <field name="visitId"><text-find ignore-case="true"/></field> Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java (original) +++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java Thu Aug 26 17:58:41 2010 @@ -148,7 +148,7 @@ public class CategoryContentWrapper impl Map<String, Object> inContext = FastMap.newInstance(); inContext.put("productCategory", productCategory); inContext.put("categoryContent", categoryContent); - ContentWorker.renderContentAsText(dispatcher, delegator, categoryContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, false); + ContentWorker.renderContentAsText(dispatcher, delegator, categoryContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, true); } } } Modified: ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml Thu Aug 26 17:58:41 2010 @@ -9375,6 +9375,15 @@ <value xml:lang="th">à¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸°à¸à¸</value> <value xml:lang="zh">ç»å½</value> </property> + <property key="PageTitleLookupGeo"> + <value xml:lang="en">Lookup Geo</value> + <value xml:lang="fr">Consulter la zone géographique</value> + <value xml:lang="it">Ricerca Geografia</value> + <value xml:lang="pt_BR">Buscar localização</value> + <value xml:lang="ro">Cauta Geografia</value> + <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¸£à¸à¸ªà¸£à¹à¸²à¸</value> + <value xml:lang="zh">æ¥æ¾å°ç</value> + </property> <property key="PageTitleMain"> <value xml:lang="cs">úvodnà strana</value> <value xml:lang="de">Startseite</value> Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl Thu Aug 26 17:58:41 2010 @@ -20,7 +20,7 @@ under the License. Event.observe(window, 'load', function() { if ($('${dependentForm}')) { Event.observe($('${dependentForm}_${mainId}'), 'change', function() { - getDependentDropdownValues('${requestName}', '${mainId}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}', '', ''); + getDependentDropdownValues('${requestName}', '${paramKey}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}', '', ''); }); getDependentDropdownValues('${requestName}', '${paramKey}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}', '${selectedDependentOption}', ''); } Modified: ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml Thu Aug 26 17:58:41 2010 @@ -25,7 +25,6 @@ under the License. <screen name="LookupGeo"> <section> <actions> - <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleLookupGeo}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> Modified: ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml (original) +++ ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml Thu Aug 26 17:58:41 2010 @@ -130,7 +130,6 @@ under the License. </form> <form name="FindGenericEntity" type="single" target="list${entity}" title="" focus-field-name="idName"> - <field name="hideSearch"><hidden value="Y"/></field> <field name="idName" title="${uiLabelMap.FormFieldTitle_${pkIdName}"><text size="16"/></field> <field name="idName_op" ><hidden value="contains"/></field> <field name="idName_ic" ><hidden value="Y"/></field> Modified: ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml Thu Aug 26 17:58:41 2010 @@ -84,6 +84,7 @@ under the License. <!-- View Mappings --> <view-map name="main" type="screen" page="component://example/widget/example/BirtScreens.xml#main"/> <view-map name="Report" type="screen" page="component://example/widget/example/BirtScreens.xml#Report"/> + <view-map name="chartReport" type="screen" page="component://example/widget/example/BirtScreens.xml#chartReport"/> <view-map name="Mail" type="screen" page="component://example/widget/example/BirtScreens.xml#EditMail"/> <!-- Supported Content Types --> @@ -95,8 +96,6 @@ under the License. application/vnd.ms-powerpoint --> <view-map name="ViewHandler" type="birt" page="component://example/webapp/birt/report/example.rptdesign" content-type="application/pdf"/> - <view-map name="chartViewHandler" type="birt" page="component://example/webapp/birt/report/chart.rptdesign" content-type="application/pdf"/> - <view-map name="chartReport" type="screen" page="component://example/widget/example/BirtScreens.xml#chartReport"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml Thu Aug 26 17:58:41 2010 @@ -87,7 +87,7 @@ under the License. <menu-item name="Mail" title="${uiLabelMap.ExampleBirtMail}"><link target="Mail"/></menu-item> <!-- Reports using charts--> <menu-item name="chartReport" title="${uiLabelMap.ExampleBirtChartReport}"><link target="chartReport"/></menu-item> - <menu-item name="chartExport" title="${uiLabelMap.ExampleBirtChartViewHandler} (not working)"><link target="chartViewHandler"/></menu-item> + <menu-item name="chartExport" title="${uiLabelMap.ExampleBirtChartViewHandler}"><link target="chartViewHandler"/></menu-item> </menu> <menu name="ExampleCharts" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> Modified: ofbiz/branches/jquery/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original) +++ ofbiz/branches/jquery/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java Thu Aug 26 17:58:41 2010 @@ -193,7 +193,8 @@ public class LabelManagerFactory { for (int i = 0; i < localeNames.size(); i++) { String localeName = localeNames.get(i); String localeValue = localeValues.get(i); - String localeComment = localeComments.get(i); + String localeComment = null; + if (UtilValidate.isNotEmpty(localeComments)) localeComment = localeComments.get(i); if (UtilValidate.isNotEmpty(localeValue) || UtilValidate.isNotEmpty(localeComment)) { if (label == null) { try { Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original) +++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Thu Aug 26 17:58:41 2010 @@ -208,7 +208,7 @@ public class MacroFormRenderer implement boolean ajaxEnabled = inPlaceEditor != null && this.javaScriptEnabled; if (UtilValidate.isNotEmpty(description) && size > 0 && description.length() > size ) { title = description; - description = description.substring(0, size-3)+"..."; + description = description.substring(0, size - 8) + "..." + description.substring(description.length() - 5); } StringWriter sr = new StringWriter(); @@ -668,6 +668,9 @@ public class MacroFormRenderer implement Debug.logError(nfe, "Error reading size of a field fieldName=" + dropDownField.getModelFormField().getFieldName() + " FormName= " + dropDownField.getModelFormField().getModelForm().getName(), module); } + if (textSize > 0 && UtilValidate.isNotEmpty(currentValue) && currentValue.length() > textSize) { + currentValue = currentValue.substring(0, textSize - 8) + "..." + currentValue.substring(currentValue.length() - 5); + } } boolean ajaxEnabled = autoComplete != null && this.javaScriptEnabled; String className = ""; @@ -714,6 +717,9 @@ public class MacroFormRenderer implement explicitDescription = (ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues)); } + if (textSize > 0 && UtilValidate.isNotEmpty(explicitDescription) && explicitDescription.length() > textSize) { + explicitDescription = explicitDescription.substring(0, textSize - 8) + "..." + explicitDescription.substring(explicitDescription.length() - 5); + } // if allow empty is true, add an empty option if (dropDownField.isAllowEmpty()) { allowEmpty = "Y"; @@ -745,7 +751,7 @@ public class MacroFormRenderer implement String description = encode(optionValue.getDescription(), modelFormField, context); String unescaped = StringEscapeUtils.unescapeHtml(description); if (textSize > 0 && unescaped.length() > textSize ) { - String reduced = unescaped.substring(0, textSize - 3) + "..."; + String reduced = unescaped.substring(0, textSize - 8) + "..." + unescaped.substring(unescaped.length() - 5); description = StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(reduced)); } options.append(description); @@ -2941,7 +2947,7 @@ public class MacroFormRenderer implement } if( UtilValidate.isNotEmpty(description) && size > 0 && description.length() > size) { imgTitle = description; - description = description.substring(0, size - 3) + "..."; + description = description.substring(0, size - 8) + "..." + description.substring(description.length() - 5); } if(UtilValidate.isEmpty(imgTitle)){ imgTitle = modelFormField.getTitle(context); Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=989850&r1=989849&r2=989850&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Thu Aug 26 17:58:41 2010 @@ -22,7 +22,6 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="FindFixedAssets" type="single" target="findFixedAssets" title="${uiLabelMap.AccountingFindFixedAssets}" header-row-style="header-row" default-table-style="basic-table"> - <field name="hideSearch"><hidden value="Y"/></field> <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}"><text-find ignore-case="true"/></field> <field name="instanceOfProductId" title="${uiLabelMap.AccountingInstanceOfProductId}"><text-find ignore-case="true"/></field> <field name="classEnumId" title="${uiLabelMap.AccountingFixedAssetClassEnumId}"> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 26 17:58:41 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-988870,989031 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-989830 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 26 17:58:41 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-988870,989031 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-989830 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 26 17:58:41 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-988870,989031 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-989830 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |