svn commit: r1652969 [2/5] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1652969 [2/5] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml Mon Jan 19 11:50:29 2015 @@ -28,8 +28,6 @@ under the License. <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="BillingAccount"/> <field-map field-name="orderBy" value="billingAccountId"/> - <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="billingAccountId" widget-style="buttontext"> @@ -87,10 +85,10 @@ under the License. <set field="paidInvoice" value="${groovy: org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId).compareTo(java.math.BigDecimal.ZERO)==0}" type="Boolean"/> <set field="amountToApply" value="${groovy: import java.text.NumberFormat; - return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> + return(NumberFormat.getNumberInstance(locale).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> <set field="total" value="${groovy: import java.text.NumberFormat; - return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/> + return(NumberFormat.getNumberInstance(locale).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/> </row-actions> <field name="billingAccountId"><hidden/></field> <field name="invoiceId" widget-style="buttontext"> @@ -121,27 +119,23 @@ under the License. <actions> <set field="availableBalance" value="${groovy:billingAccount != null ? org.ofbiz.order.order.OrderReadHelper.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/> </actions> - <alt-target use-when="billingAccount==null" target="createBillingAccount"/> + <alt-target use-when="billingAccount==null" target="createBillingAccountAndRole"/> <auto-fields-service service-name="updateBillingAccount" map-name="billingAccount"/> - <field name="description"><text size="60"/></field> - + <field use-when="billingAccount==null" name="billingAccountId"><hidden/></field> <field use-when="billingAccount!=null" name="billingAccountId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - - <field use-when="partyId != null" name="partyId"><hidden/></field> - <field use-when="roleTypeId != null" name="roleTypeId"><hidden/></field> - <field name="partyId" use-when="partyId == null" title="${uiLabelMap.AccountingPartyBilledTo}"><lookup target-form-name="LookupPartyName"/></field> - <field use-when="roleTypeId == null" name="roleTypeId"><hidden value="BILL_TO_CUSTOMER"/></field> - + <field name="partyId" use-when="billingAccount != null" ><display/></field> + <field name="partyId" use-when="billingAccount == null" title="${uiLabelMap.AccountingPartyBilledTo}" required-field="true"><lookup target-form-name="LookupPartyName"/></field> + <field name="roleTypeId"><hidden/></field> <field name="accountCurrencyUomId"> <drop-down allow-empty="false" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}"> - <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom"> + <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="contactMechId" tooltip="${uiLabelMap.AccountingBillingContactMechIdMessage}"> + <field name="contactMechId" tooltip="${uiLabelMap.AccountingBillingContactMechIdMessage}" use-when="billingAccount != null"> <drop-down> <entity-options entity-name="BillingAccountRoleAndAddress" description="[${partyId}][${contactMechId}] ${toName}, ${attnName}, ${address1}, ${stateProvinceGeoId} ${postalCode}" key-field-name="contactMechId" filter-by-date="true"> <entity-constraint name="billingAccountId" env-name="billingAccountId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountScreens.xml?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountScreens.xml Mon Jan 19 11:50:29 2015 @@ -126,8 +126,12 @@ under the License. <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <set field="billingAccountId" from-field="parameters.billingAccountId"/> <entity-one entity-name="BillingAccount" value-field="billingAccount"/> - <set field="partyId" from-field="parameters.partyId"/> - <set field="roleTypeId" from-field="parameters.roleTypeId"/> + <entity-and entity-name="BillingAccountRole" list="billingAccountRolesCustomer" filter-by-date="true"> + <field-map field-name="billingAccountId" from-field="billingAccount.billingAccountId"/> + <field-map field-name="roleTypeId" value="BILL_TO_CUSTOMER"/> + </entity-and> + <set field="partyId" from-field="parameters.partyId" default-value="${billingAccountRolesCustomer[0].partyId}"/> + <set field="roleTypeId" from-field="parameters.roleTypeId" default-value="BILL_TO_CUSTOMER"/> </actions> <widgets> <decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java Mon Jan 19 11:50:29 2015 @@ -47,9 +47,9 @@ import org.ofbiz.entity.util.EntityUtilP import org.ofbiz.service.LocalDispatcher; import org.ofbiz.webapp.control.RequestHandler; import org.ofbiz.webapp.website.WebSiteWorker; -import org.ofbiz.widget.form.FormStringRenderer; -import org.ofbiz.widget.form.MacroFormRenderer; -import org.ofbiz.widget.screen.ScreenRenderer; +import org.ofbiz.widget.renderer.FormStringRenderer; +import org.ofbiz.widget.renderer.ScreenRenderer; +import org.ofbiz.widget.renderer.macro.MacroFormRenderer; import freemarker.template.TemplateException; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java Mon Jan 19 11:50:29 2015 @@ -69,7 +69,7 @@ import freemarker.ext.dom.NodeModel; /** * ContentWorker Class */ -public class ContentWorker implements org.ofbiz.widget.ContentWorkerInterface { +public class ContentWorker implements org.ofbiz.widget.content.ContentWorkerInterface { public static final String module = ContentWorker.class.getName(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Mon Jan 19 11:50:29 2015 @@ -76,11 +76,11 @@ import org.ofbiz.entity.util.EntityQuery import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; -import org.ofbiz.widget.screen.MacroScreenRenderer; -import org.ofbiz.widget.screen.ModelScreen; -import org.ofbiz.widget.screen.ScreenFactory; -import org.ofbiz.widget.screen.ScreenRenderer; -import org.ofbiz.widget.screen.ScreenStringRenderer; +import org.ofbiz.widget.model.ModelScreen; +import org.ofbiz.widget.model.ScreenFactory; +import org.ofbiz.widget.renderer.ScreenRenderer; +import org.ofbiz.widget.renderer.ScreenStringRenderer; +import org.ofbiz.widget.renderer.macro.MacroScreenRenderer; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -90,7 +90,7 @@ import freemarker.template.TemplateExcep /** * DataResourceWorker Class */ -public class DataResourceWorker implements org.ofbiz.widget.DataResourceWorkerInterface { +public class DataResourceWorker implements org.ofbiz.widget.content.DataResourceWorkerInterface { public static final String module = DataResourceWorker.class.getName(); public static final String err_resource = "ContentErrorUiLabels"; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/output/OutputServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/output/OutputServices.java?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/output/OutputServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/output/OutputServices.java Mon Jan 19 11:50:29 2015 @@ -63,9 +63,9 @@ import org.ofbiz.entity.util.EntityUtilP import org.ofbiz.service.DispatchContext; import org.ofbiz.service.ServiceUtil; import org.ofbiz.webapp.view.ApacheFopWorker; -import org.ofbiz.widget.fo.FoFormRenderer; -import org.ofbiz.widget.fo.FoScreenRenderer; -import org.ofbiz.widget.screen.ScreenRenderer; +import org.ofbiz.widget.renderer.fo.FoFormRenderer; +import org.ofbiz.widget.renderer.fo.FoScreenRenderer; +import org.ofbiz.widget.renderer.ScreenRenderer; /** Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy Mon Jan 19 11:50:29 2015 @@ -20,7 +20,7 @@ import org.ofbiz.entity.* import org.ofbiz.entity.condition.* import org.ofbiz.base.util.* -import org.ofbiz.widget.html.* +import org.ofbiz.widget.renderer.html.* surveyQuestionId = parameters.surveyQuestionId; context.surveyQuestionId = surveyQuestionId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy Mon Jan 19 11:50:29 2015 @@ -17,7 +17,7 @@ * under the License. */ -import org.ofbiz.widget.html.HtmlFormWrapper; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; productionRunId = parameters.productionRunId ?: parameters.workEffortId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy Mon Jan 19 11:50:29 2015 @@ -17,7 +17,7 @@ * under the License. */ -import org.ofbiz.widget.html.HtmlFormWrapper; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; productionRunId = parameters.productionRunId ?: parameters.workEffortId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy Mon Jan 19 11:50:29 2015 @@ -18,7 +18,7 @@ */ import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.widget.html.HtmlFormWrapper; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; productionRunId = parameters.productionRunId ?: parameters.workEffortId; taskCosts = []; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Mon Jan 19 11:50:29 2015 @@ -22,7 +22,7 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.GenericValue; -import org.ofbiz.widget.html.HtmlFormWrapper; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; import org.ofbiz.manufacturing.jobshopmgt.ProductionRun; import javolution.util.FastList; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy Mon Jan 19 11:50:29 2015 @@ -17,7 +17,7 @@ * under the License. */ -import org.ofbiz.widget.html.HtmlFormWrapper; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; productionRunId = parameters.productionRunId ?: parameters.workEffortId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy Mon Jan 19 11:50:29 2015 @@ -21,7 +21,7 @@ import java.util.*; import org.ofbiz.base.util.*; import org.ofbiz.entity.*; -import org.ofbiz.widget.html.*; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; if (security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) { context.hasPermission = Boolean.TRUE; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy Mon Jan 19 11:50:29 2015 @@ -18,7 +18,7 @@ */ -import org.ofbiz.widget.html.HtmlFormWrapper; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; import org.ofbiz.base.util.*; if (security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy Mon Jan 19 11:50:29 2015 @@ -25,7 +25,7 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.base.util.*; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.widget.html.HtmlFormWrapper; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; import org.ofbiz.manufacturing.jobshopmgt.ProductionRun; delegator = request.getAttribute("delegator"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java Mon Jan 19 11:50:29 2015 @@ -591,6 +591,7 @@ public class OrderLookupServices { eli = EntityQuery.use(delegator) .select(fieldsToSelect) .from(dve) + .where(cond) .orderBy(orderBy) .distinct() // set distinct on so we only get one row per order .maxRows(highIndex) Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy Mon Jan 19 11:50:29 2015 @@ -19,7 +19,7 @@ import org.ofbiz.base.util.*; import org.ofbiz.entity.*; -import org.ofbiz.widget.html.*; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; orderId = request.getParameter("orderId"); orderTypeId = null; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Mon Jan 19 11:50:29 2015 @@ -55,6 +55,7 @@ function toggleBillingAccount(box) { </script> <#assign cart = shoppingCart!/> <form method="post" name="checkoutInfoForm" style="margin:0;"> + <fieldset> <input type="hidden" name="checkoutpage" value="shippingaddress"/> <div class="screenlet" style="height: 100%;"> <div class="screenlet-title-bar"> @@ -133,6 +134,7 @@ function toggleBillingAccount(box) { ${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")} </div> </div> + </fieldset> </form> <table width="100%"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/findOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/findOrders.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/findOrders.ftl Mon Jan 19 11:50:29 2015 @@ -148,6 +148,11 @@ function toggleOrderIdList() { <td width='5%'> </td> <td align='left'><input type='text' name='orderId'/></td> </tr> + <tr> + <td width='25%' align='right' class='label'>${uiLabelMap.OrderOrderName}</td> + <td width='5%'> </td> + <td align='left'><input type='text' name='orderName'/></td> + </tr> <tr> <td width='25%' align='right' class='label'>${uiLabelMap.OrderExternalId}</td> <td width='5%'> </td> @@ -589,6 +594,7 @@ document.lookuporder.orderId.focus(); </td> <td width="5%">${uiLabelMap.OrderOrderType}</td> <td width="5%">${uiLabelMap.OrderOrderId}</td> + <td width="10 %">${uiLabelMap.OrderOrderName}</td> <td width="20%">${uiLabelMap.PartyName}</td> <td width="5%" align="right">${uiLabelMap.OrderSurvey}</td> <td width="5%" align="right">${uiLabelMap.OrderItemsOrdered}</td> @@ -625,6 +631,11 @@ document.lookuporder.orderId.focus(); </td> <td>${orderType.get("description",locale)?default(orderType.orderTypeId?default(""))}</td> <td><a href="<@ofbizUrl>orderview?orderId=${orderHeader.orderId}</@ofbizUrl>" class='buttontext'>${orderHeader.orderId}</a></td> + <#if orderHeader.orderName?has_content> + <td><a href="<@ofbizUrl>orderview?orderId=${orderHeader.orderId}</@ofbizUrl>" class='buttontext'>${orderHeader.orderName}</a></td> + <#else> + <td></td> + </#if> <td> <div> <#if displayParty?has_content> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyTypeData.xml?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyTypeData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyTypeData.xml Mon Jan 19 11:50:29 2015 @@ -303,7 +303,7 @@ under the License. <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Partner" partyRelationshipTypeId="PARTNERSHIP" roleTypeIdValidFrom="" roleTypeIdValidTo=""/> <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Sales Affiliate" partyRelationshipTypeId="SALES_AFFILIATE" roleTypeIdValidFrom="" roleTypeIdValidTo=""/> <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Spouse" partyRelationshipTypeId="SPOUSE" roleTypeIdValidFrom="" roleTypeIdValidTo=""/> - <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Supplier" partyRelationshipTypeId="SUPPLIER_REL" roleTypeIdValidFrom="" roleTypeIdValidTo=""/> + <PartyRelationshipType description="" hasTable="Y" parentTypeId="" partyRelationshipName="Supplier" partyRelationshipTypeId="SUPPLIER_REL" roleTypeIdValidFrom="" roleTypeIdValidTo=""/> <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Web Master" partyRelationshipTypeId="WEB_MASTER_ASSIGNMEN" roleTypeIdValidFrom="" roleTypeIdValidTo=""/> <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Account owned by" partyRelationshipTypeId="ACCOUNT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/> <PartyRelationshipType description="" hasTable="N" parentTypeId="" partyRelationshipName="Assistant" partyRelationshipTypeId="ASSISTANT" roleTypeIdValidFrom="" roleTypeIdValidTo=""/> @@ -372,7 +372,10 @@ under the License. <StatusValidChange condition="" statusId="COM_ROLE_READ" statusIdTo="COM_ROLE_COMPLETED" transitionName="Completed"/> <StatusType description="Party Relationship" hasTable="N" parentTypeId="" statusTypeId="PARTY_REL_STATUS"/> - + <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="PARTYREL_CREATED" statusTypeId="PARTY_REL_STATUS"/> + <StatusItem description="Expired" sequenceId="02" statusCode="EXPIRED" statusId="PARTYREL_EXPIRED" statusTypeId="PARTY_REL_STATUS"/> + <StatusValidChange condition="" statusId="PARTYREL_CREATED" statusIdTo="PARTYREL_EXPIRED" transitionName="Expired"/> + <StatusType description="Party Invitation" hasTable="N" parentTypeId="" statusTypeId="PARTY_INV_STATUS"/> <StatusItem description="Invitation Sent" sequenceId="01" statusCode="SENT" statusId="PARTYINV_SENT" statusTypeId="PARTY_INV_STATUS"/> <StatusItem description="Invitation Pending" sequenceId="02" statusCode="PENDING" statusId="PARTYINV_PENDING" statusTypeId="PARTY_INV_STATUS"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java Mon Jan 19 11:50:29 2015 @@ -36,6 +36,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; +import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityQuery; /** @@ -81,24 +82,26 @@ public class CatalogUrlServlet extends H String pathInfo = request.getPathInfo(); List<String> pathElements = StringUtil.split(pathInfo, "/"); - // look for productId String productId = null; + String categoryId = null; try { String lastPathElement = pathElements.get(pathElements.size() - 1); - if (lastPathElement.startsWith("p_") || EntityQuery.use(delegator).from("Product").where("productId", lastPathElement).cache(true).queryOne() != null) { - if (lastPathElement.startsWith("p_")) { - productId = lastPathElement.substring(2); + if (lastPathElement.startsWith("p_")) { + productId = lastPathElement.substring(2); + } else { + GenericValue productCategory = EntityQuery.use(delegator).from("ProductCategory").where("productCategoryId", lastPathElement).cache(true).queryOne(); + if (UtilValidate.isNotEmpty(productCategory)) { + categoryId = lastPathElement; } else { productId = lastPathElement; } - pathElements.remove(pathElements.size() - 1); } + pathElements.remove(pathElements.size() - 1); } catch (GenericEntityException e) { - Debug.logError(e, "Error looking up product info for ProductUrl with path info [" + pathInfo + "]: " + e.toString(), module); + Debug.logError(e, "Error in looking up ProductUrl or CategoryUrl with path info [" + pathInfo + "]: " + e.toString(), module); } // get category info going with the IDs that remain - String categoryId = null; if (pathElements.size() == 1) { CategoryWorker.setTrail(request, pathElements.get(0), null); categoryId = pathElements.get(0); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy Mon Jan 19 11:50:29 2015 @@ -21,7 +21,7 @@ import org.ofbiz.base.util.* import org.ofbiz.base.util.string.* import org.ofbiz.entity.* import org.ofbiz.entity.util.EntityUtilProperties; -import org.ofbiz.widget.html.* +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; // make the image file formats imageFilenameFormat = "configitems/${configItemId}"; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy Mon Jan 19 11:50:29 2015 @@ -20,7 +20,7 @@ import org.ofbiz.entity.*; import org.ofbiz.entity.util.*; import org.ofbiz.base.util.*; -import org.ofbiz.widget.html.*; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; contentId = request.getParameter("contentId") ?: null; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy Mon Jan 19 11:50:29 2015 @@ -17,7 +17,7 @@ * under the License. */ -import org.ofbiz.widget.html.* +import org.ofbiz.widget.renderer.html.HtmlFormWrapper createConfigOptionWrapper = new HtmlFormWrapper("component://product/widget/catalog/ConfigForms.xml", "CreateConfigOption", request, response); createConfigOptionWrapper.putInContext("configItemId", configItemId); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Mon Jan 19 11:50:29 2015 @@ -204,12 +204,12 @@ under the License. <div>${uiLabelMap.ProductNoConditionProducts}</div> </#if> <div> - <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>"> + <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>" name="createProductPromoProductConditions"> <input type="hidden" name="productPromoId" value="${productPromoId}" /> <input type="hidden" name="productPromoRuleId" value="${productPromoCond.productPromoRuleId}" /> <input type="hidden" name="productPromoActionSeqId" value="_NA_" /> <input type="hidden" name="productPromoCondSeqId" value="${productPromoCond.productPromoCondSeqId}" /> - ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value=""/> + <@htmlTemplate.lookupField formName="createProductPromoProductConditions" name="productId" id="productId" fieldFormName="LookupProduct"/> <select name="productPromoApplEnumId"> <#list productPromoApplEnums as productPromoApplEnum> <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option> @@ -388,12 +388,12 @@ under the License. <div>${uiLabelMap.ProductNoActionProducts}</div> </#if> <div> - <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>"> + <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>" name="createProductPromoProductActions">> <input type="hidden" name="productPromoId" value="${productPromoId}" /> <input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}" /> <input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}" /> <input type="hidden" name="productPromoCondSeqId" value="_NA_" /> - ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value=""/> + <@htmlTemplate.lookupField formName="createProductPromoProductActions" name="productId" id="productId" fieldFormName="LookupProduct"/> <select name="productPromoApplEnumId"> <#list productPromoApplEnums as productPromoApplEnum> <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy Mon Jan 19 11:50:29 2015 @@ -18,7 +18,7 @@ */ import org.ofbiz.entity.condition.* -import org.ofbiz.widget.html.HtmlFormWrapper +import org.ofbiz.widget.renderer.html.HtmlFormWrapper shipmentId = parameters.shipmentId; shipment = from("Shipment").where("shipmentId", shipmentId).queryOne(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy Mon Jan 19 11:50:29 2015 @@ -17,7 +17,7 @@ * under the License. */ -import org.ofbiz.widget.html.*; +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; import org.ofbiz.entity.condition.EntityCondition; shipmentId = request.getParameter("shipmentId"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml Mon Jan 19 11:50:29 2015 @@ -1235,8 +1235,9 @@ under the License. <form name="ListCostComponents" type="list" title="" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="EditProductCosts"> <actions> + <set field="InParam.productId" from-field="requestParameters.productId"/> <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="InParam"/> <field-map field-name="entityName" value="CostComponent"/> <field-map field-name="viewIndex" from-field="viewIndex"/> <field-map field-name="viewSize" from-field="viewSize"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java Mon Jan 19 11:50:29 2015 @@ -73,9 +73,9 @@ import org.ofbiz.service.LocalDispatcher import org.ofbiz.service.ServiceUtil; import org.ofbiz.service.mail.MimeMessageWrapper; import org.ofbiz.webapp.view.ApacheFopWorker; -import org.ofbiz.widget.fo.FoScreenRenderer; -import org.ofbiz.widget.html.HtmlScreenRenderer; -import org.ofbiz.widget.screen.ScreenRenderer; +import org.ofbiz.widget.renderer.fo.FoScreenRenderer; +import org.ofbiz.widget.renderer.html.HtmlScreenRenderer; +import org.ofbiz.widget.renderer.ScreenRenderer; import org.xml.sax.SAXException; import com.sun.mail.smtp.SMTPAddressFailedException; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/handlers-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/handlers-controller.xml?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/handlers-controller.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/handlers-controller.xml Mon Jan 19 11:50:29 2015 @@ -35,11 +35,11 @@ under the License. <handler name="script" type="request" class="org.ofbiz.webapp.event.ScriptEventHandler"/> <!-- view handlers --> - <handler name="screen" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/> - <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/> - <handler name="screentext" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/> - <handler name="screencsv" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/> - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> + <handler name="screen" type="view" class="org.ofbiz.widget.renderer.macro.MacroScreenViewHandler"/> + <handler name="screenxml" type="view" class="org.ofbiz.widget.renderer.macro.MacroScreenViewHandler"/> + <handler name="screentext" type="view" class="org.ofbiz.widget.renderer.macro.MacroScreenViewHandler"/> + <handler name="screencsv" type="view" class="org.ofbiz.widget.renderer.macro.MacroScreenViewHandler"/> + <handler name="screenfop" type="view" class="org.ofbiz.widget.renderer.fo.ScreenFopViewHandler"/> <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> </site-conf> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/PortalPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/PortalPageScreens.xml?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/PortalPageScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/PortalPageScreens.xml Mon Jan 19 11:50:29 2015 @@ -94,7 +94,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/images/myportal.js" global="true"/> <set field="layoutSettings.styleSheets[+0]" value="/images/myportal.css" global="true"/> <entity-one entity-name="PortalPage" value-field="portalPage"/> - <set field="portalPages" value="${groovy:org.ofbiz.widget.PortalPageWorker.getPortalPages(parameters.parentPortalPageId,context)}"/> + <set field="portalPages" value="${groovy:org.ofbiz.widget.portal.PortalPageWorker.getPortalPages(parameters.parentPortalPageId,context)}"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Mon Jan 19 11:50:29 2015 @@ -1805,10 +1805,18 @@ public class GenericDelegator implements beganTransaction = TransactionUtil.begin(); } - EntityListIterator eli = this.find(entityName, entityCondition, null, fieldsToSelect, orderBy, findOptions); - eli.setDelegator(this); - List<GenericValue> list = eli.getCompleteList(); - eli.close(); + EntityListIterator eli = null; + List<GenericValue> list = null; + try { + eli = this.find(entityName, entityCondition, null, fieldsToSelect, orderBy, findOptions); + list = eli.getCompleteList(); + } finally { + if (eli != null) { + try { + eli.close(); + } catch (Exception exc) {} + } + } if (useCache) { ecaRunner.evalRules(EntityEcaHandler.EV_CACHE_PUT, EntityEcaHandler.OP_FIND, dummyValue, false); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/ecommain.css URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/ecommain.css?rev=1652969&r1=1652968&r2=1652969&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/ecommain.css (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/ecommain.css Mon Jan 19 11:50:29 2015 @@ -286,14 +286,14 @@ text-align:left; #ecom-mainarea .left { background:#fff; float:left; -width:180px; +width:250px; margin:0 0 0 10px; } #ecom-mainarea .right { background:#fff; float:right; -width:240px; +width:250px; margin:0 10px 0 0; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |