svn commit: r1640111 [1/4] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1640111 [1/4] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Nov 17 09:11:33 2014 New Revision: 1640111 URL: http://svn.apache.org/r1640111 Log: Keeps in sync with OFBiz trunk HEAD Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/httpclient-4.3.6.jar - copied unchanged from r1640109, ofbiz/trunk/framework/base/lib/httpclient-4.3.6.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/httpclient-cache-4.3.6.jar - copied unchanged from r1640109, ofbiz/trunk/framework/base/lib/httpclient-cache-4.3.6.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/httpcore-4.3.3.jar - copied unchanged from r1640109, ofbiz/trunk/framework/base/lib/httpcore-4.3.3.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java - copied unchanged from r1640109, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/httpclient-4.2.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/httpclient-cache-4.2.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/httpcore-4.2.1.jar Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/entitydef/entitymodel.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/SecurityForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_facility.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/keywordsearch.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services_security.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/security-controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/SecurityForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/entitydef/entitymodel.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/security/entitydef/entitymodel.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidget.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetVisitor.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FormRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelForm.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/entitydef/entitymodel.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumPermissionServices.xml Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1637805-1640109 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Mon Nov 17 09:11:33 2014 @@ -22,9 +22,9 @@ <classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/fop-1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.21.jar"/> - <classpathentry kind="lib" path="framework/base/lib/httpclient-4.2.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.2.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/httpcore-4.2.1.jar"/> + <classpathentry kind="lib" path="framework/base/lib/httpclient-4.3.6.jar"/> + <classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.3.6.jar"/> + <classpathentry kind="lib" path="framework/base/lib/httpcore-4.3.3.jar"/> <classpathentry kind="lib" path="framework/base/lib/httpunit-1.7.jar"/> <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/> <classpathentry kind="lib" path="framework/base/lib/icu4j-52_1.jar"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Mon Nov 17 09:11:33 2014 @@ -19,9 +19,9 @@ framework/base/lib/batik-all-1.7.jar framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar framework/base/lib/clhm-release-1.0-lru.jar framework/base/lib/freemarker-2.3.21.jar -framework/base/lib/httpclient-4.2.1.jar -framework/base/lib/httpclient-cache-4.2.1.jar -framework/base/lib/httpcore-4.2.1.jar +framework/base/lib/httpclient-4.3.6.jar +framework/base/lib/httpclient-cache-4.3.6.jar +framework/base/lib/httpcore-4.3.3.jar framework/base/lib/ivy-2.2.0.jar framework/base/lib/jackson-annotations-2.4.0.jar framework/base/lib/jackson-core-2.4.2.jar Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml Mon Nov 17 09:11:33 2014 @@ -122,7 +122,12 @@ under the License. <!-- expire all of them --> <iterate list="uomConversions" entry="uomConversion"> - <set from-field="nowTimestamp" field="uomConversion.thruDate"/> + <if-empty field="parameters.fromDate"> + <set from-field="nowTimestamp" field="uomConversion.thruDate"/> + <else> + <set from-field="parameters.fromDate" field="uomConversion.thruDate"/> + </else> + </if-empty> </iterate> <store-list list="uomConversions"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementServices.java Mon Nov 17 09:11:33 2014 @@ -181,6 +181,7 @@ public class ContentManagementServices { } GenericValue content = delegator.makeValue("Content"); + content.setPKFields(context); content.setNonPKFields(context); String contentId = (String) content.get("contentId"); @@ -334,7 +335,6 @@ public class ContentManagementServices { results.put("contentId", contentId); context.put("contentId", contentId); context.put("caContentIdTo", contentId); - contentAssoc.put("contentIdTo", contentId); // Add ContentPurposes if this is a create operation if (contentId != null && !contentExists) { @@ -410,7 +410,7 @@ public class ContentManagementServices { results.put("caSequenceNum", thisResult.get("sequenceNum")); } else { if (deactivateExisting) { - contentAssoc.put("thruDate", UtilDateTime.nowTimestamp()); + contentAssocExisting.put("thruDate", UtilDateTime.nowTimestamp()); } ModelService contentAssocModel = dispatcher.getDispatchContext().getModelService("updateContentAssoc"); Map<String, Object> ctx = contentAssocModel.makeValid(contentAssoc, "IN"); 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=1640111&r1=1640110&r2=1640111&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 Nov 17 09:11:33 2014 @@ -23,6 +23,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; import java.sql.Timestamp; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -189,7 +190,12 @@ public class ContentWorker implements or DispatchContext dctx = dispatcher.getDispatchContext(); ModelService service = dctx.getModelService(serviceName); if (service != null) { - Map<String,Object> serviceCtx = service.makeValid(templateContext, ModelService.IN_PARAM); + //put all requestParameters into templateContext to use them as IN service parameters + Map<String,Object> tempTemplateContext = new HashMap<>(); + @SuppressWarnings("unchecked") + Map<String,Object> temp = (Map<String, Object>) templateContext.get("requestParameters"); + tempTemplateContext.putAll(temp); + Map<String,Object> serviceCtx = service.makeValid(tempTemplateContext, ModelService.IN_PARAM); Map<String,Object> serviceRes; try { serviceRes = dispatcher.runSync(serviceName, serviceCtx); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSForms.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSForms.xml Mon Nov 17 09:11:33 2014 @@ -51,6 +51,7 @@ under the License. <parameter param-name="MASTER_caContentIdTo" from-field="caContentIdTo"/> <parameter param-name="MASTER_caContentAssocTypeId" from-field="caContentAssocTypeId"/> <parameter param-name="MASTER_caFromDate" from-field="caFromDate"/> + <parameter param-name="MASTER_caMapKey" from-field="caMapKey"/> </hyperlink> <!-- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent"> @@ -406,7 +407,7 @@ under the License. </field> <field name="caMapKey" position="2" use-when=""${caMapKey}".length()>0" > - <display /> + <text /> </field> <field name="caContentAssocTypeId" position="1" use-when=""${caContentAssocTypeId}".length()>0" > @@ -423,8 +424,18 @@ under the License. <entity-options description="${description}" entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/> </drop-down> </field> - <field name="caFromDate" title="${uiLabelMap.CommonFromDate}" widget-style="buttontext" position="1"><date-time default-value="${nowTimestamp}"/></field> - <field name="caThruDate" title="${uiLabelMap.CommonThruDate}" widget-style="buttontext" position="2"><date-time/></field> + <field name="caFromDate" title="${uiLabelMap.CommonFromDate}" widget-style="buttontext" position="1" use-when=""${caFromDate}".length()>0"> + <display default-value="${nowTimestamp}"/> + </field> + <field name="caFromDate" title="${uiLabelMap.CommonFromDate}" widget-style="buttontext" position="1" use-when=""${caFromDate}".length()==0"> + <date-time default-value="${nowTimestamp}"/> + </field> + <field name="caThruDate" title="${uiLabelMap.CommonThruDate}" widget-style="buttontext" position="2" use-when=""${caThruDate}".length()>0"> + <date-time/> + </field> + <field name="caThruDate" title="${uiLabelMap.CommonThruDate}" widget-style="buttontext" position="2" use-when=""${caThruDate}".length()==0"> + <date-time/> + </field> <field name="contentTitle" title="${uiLabelMap.ContentContent}" title-style="h1" map-name="dummy"> <display description=""/> </field> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSScreens.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/cms/CMSScreens.xml Mon Nov 17 09:11:33 2014 @@ -103,7 +103,9 @@ under the License. <set field="MASTER_caContentIdTo" from-field="parameters.MASTER_caContentIdTo" default-value="${parameters.caContentIdTo}"/> <set field="MASTER_caContentId" from-field="parameters.MASTER_caContentId" default-value="${parameters.caContentIdFrom}"/> <set field="MASTER_caContentAssocTypeId" from-field="parameters.MASTER_caContentAssocTypeId" default-value="${parameters.caContentAssocTypeId}"/> + <set field="MASTER_caMapKey" from-field="parameters.MASTER_caMapKey" default-value="${parameters.caMapKey}"/> <set field="MASTER_caFromDate" from-field="parameters.MASTER_caFromDate" default-value="${parameters.caFromDate}" type="Timestamp"/> + <set field="MASTER_caThruDate" from-field="parameters.MASTER_caThruDate" default-value="${parameters.caThruDate}" type="Timestamp"/> <set field="contentId" from-field="MASTER_contentId"/> <set field="drDataResourceId" from-field="MASTER_drDataResourceId"/> @@ -111,6 +113,8 @@ under the License. <set field="caContentId" from-field="MASTER_caContentId"/> <set field="caContentAssocTypeId" from-field="MASTER_caContentAssocTypeId"/> <set field="caFromDate" from-field="MASTER_caFromDate"/> + <set field="caThruDate" from-field="MASTER_caThruDate"/> + <set field="caMapKey" from-field="MASTER_caMapKey"/> <script location="component://content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy"/> @@ -123,7 +127,7 @@ under the License. <screenlet title="${uiLabelMap.ContentCMSEditPage}"> <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}"/> <include-form name="EditAddContentStuff" location="component://content/widget/cms/CMSForms.xml"/> - <content content-id="${contentId}" enable-edit-name="notfound" edit-request="EditAddSubContent?MASTER_contentId=${MASTER_contentId}&MASTER_caContentIdTo=${MASTER_caContentIdTo}&MASTER_caContentAssocTypeId=${MASTER_caContentAssocTypeId}&MASTER_caFromDate=${MASTER_caFromDate}&MASTER_drDataResourceId=${MASTER_drDataResourceId}&caContentIdTo=${caContentIdTo}"/> + <content content-id="${contentId}" enable-edit-name="notfound" edit-request="EditAddSubContent?MASTER_caMapKey=${MASTER_caMapKey}&MASTER_contentId=${MASTER_contentId}&MASTER_caContentIdTo=${MASTER_caContentIdTo}&MASTER_caContentAssocTypeId=${MASTER_caContentAssocTypeId}&MASTER_caFromDate=${MASTER_caFromDate}&MASTER_caThruDate=${MASTER_caThruDate}&MASTER_drDataResourceId=${MASTER_drDataResourceId}&caContentIdTo=${caContentIdTo}"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Mon Nov 17 09:11:33 2014 @@ -423,7 +423,7 @@ public class ProductionRun { Map<String, Object> serviceContext = UtilMisc.<String, Object>toMap("arguments", estimateCalcServiceMap); // serviceContext.put("userLogin", userLogin); Map<String, Object> resultService = dispatcher.runSync(serviceName, serviceContext); - totalTaskTime = ((Double)resultService.get("totalTime")).doubleValue(); + totalTaskTime = ((BigDecimal)resultService.get("totalTime")).doubleValue(); } } catch (Exception exc) { Debug.logError(exc, "Problem calling the customMethod service " + serviceName); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Mon Nov 17 09:11:33 2014 @@ -1229,8 +1229,8 @@ public class ProductionRunServices { if (priority.equals(routingTask.get("priority")) && ! routingTaskId.equals(routingTask.get("workEffortId"))) return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingRoutingTaskSeqIdAlreadyExist", locale)); if (routingTaskId.equals(routingTask.get("workEffortId"))) { - routingTask.set("estimatedSetupMillis", context.get("estimatedSetupMillis")); - routingTask.set("estimatedMilliSeconds", context.get("estimatedMilliSeconds")); + routingTask.set("estimatedSetupMillis", ((BigDecimal) context.get("estimatedSetupMillis")).doubleValue()); + routingTask.set("estimatedMilliSeconds", ( (BigDecimal) context.get("estimatedMilliSeconds")).doubleValue()); if (first) { // for the first routingTask the estimatedStartDate update imply estimatedStartDate productonRun update if (! estimatedStartDate.equals(pRestimatedStartDate)) { productionRun.setEstimatedStartDate(estimatedStartDate); @@ -1426,8 +1426,14 @@ public class ProductionRunServices { String description = (String)context.get("description"); Timestamp estimatedStartDate = (Timestamp)context.get("estimatedStartDate"); Timestamp estimatedCompletionDate = (Timestamp)context.get("estimatedCompletionDate"); - Double estimatedSetupMillis = (Double)context.get("estimatedSetupMillis"); - Double estimatedMilliSeconds = (Double)context.get("estimatedMilliSeconds"); + + Double estimatedSetupMillis = null; + if (context.get("estimatedSetupMillis") != null) + estimatedSetupMillis = ((BigDecimal)context.get("estimatedSetupMillis")).doubleValue(); + + Double estimatedMilliSeconds = null; + if (context.get("estimatedMilliSeconds") != null) + estimatedMilliSeconds = ((BigDecimal)context.get("estimatedMilliSeconds")).doubleValue(); // The production run is loaded ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/entitydef/entitymodel.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/entitydef/entitymodel.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/entitydef/entitymodel.xml Mon Nov 17 09:11:33 2014 @@ -276,7 +276,7 @@ under the License. <field name="fromDate" type="date-time"></field> <field name="statusDate" type="date-time"></field> <field name="statusId" type="id"></field> - <field name="setByUserLoginId" type="description"></field> + <field name="setByUserLoginId" type="id-vlong"></field> <field name="optInVerifyCode" type="short-varchar"><!-- if statusId is CLPT_PENDING, set optInVerifyCode; else if statusId is CLPT_ACCEPTED, make sure optInVerifyCode is the same as the last CLPT_PENDING --></field> <prim-key field="contactListId"/> <prim-key field="partyId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Nov 17 09:11:33 2014 @@ -2014,6 +2014,10 @@ public class OrderServices { if (changeToApprove) { newStatus = "ORDER_APPROVED"; + if ("ORDER_HOLD".equals(orderHeaderStatusId)) { + // Don't let the system to auto approve order if the order was put on hold. + return ServiceUtil.returnSuccess(); + } } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Mon Nov 17 09:11:33 2014 @@ -645,7 +645,12 @@ public class ShoppingCartEvents { if (UtilValidate.isNotEmpty(itemId)) { request.setAttribute("itemId", itemId); } - + for (int shipGroupIndex = 0; shipGroupIndex < cart.getShipGroupSize(); shipGroupIndex++) { + String shipContactMechId = cart.getShippingContactMechId(shipGroupIndex); + if (UtilValidate.isNotEmpty(shipContactMechId)) { + cart.setShipmentMethodTypeId(shipGroupIndex, null); + } + } // Determine where to send the browser if (controlDirective.equals(ERROR)) { return "error"; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Mon Nov 17 09:11:33 2014 @@ -806,6 +806,10 @@ public class ShoppingCartHelper { } } else { BigDecimal minQuantity = ShoppingCart.getMinimumOrderQuantity(delegator, item.getBasePrice(), item.getProductId()); + oldQuantity = item.getQuantity(); + if (oldQuantity.compareTo(quantity) != 0) { + cart.setShipmentMethodTypeId(index, null); + } if (quantity.compareTo(minQuantity) < 0) { quantity = minQuantity; } @@ -879,6 +883,7 @@ public class ShoppingCartHelper { Debug.logInfo("Removing item index: " + itemIndex, module); try { this.cart.removeCartItem(itemIndex, dispatcher); + cart.setShipmentMethodTypeId(itemIndex, null); } catch (CartItemModifyException e) { result = ServiceUtil.returnError(new ArrayList<String>()); errorMsgs.add(e.getMessage()); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Mon Nov 17 09:11:33 2014 @@ -2021,6 +2021,10 @@ public class ShoppingCartItem implements return listPrice; } + public void setListPrice(BigDecimal listPrice) { + this.listPrice = listPrice; + } + /** Returns isModifiedPrice */ public boolean getIsModifiedPrice() { return isModifiedPrice; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Mon Nov 17 09:11:33 2014 @@ -507,6 +507,7 @@ public class ShoppingCartServices { cartItem.setIsModifiedPrice("Y".equals(item.getString("isModifiedPrice"))); cartItem.setName(item.getString("itemDescription")); cartItem.setExternalId(item.getString("externalId")); + cartItem.setListPrice(item.getBigDecimal("unitListPrice")); // load order item attributes List<GenericValue> orderItemAttributesList = null; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy Mon Nov 17 09:11:33 2014 @@ -42,6 +42,5 @@ context.lowIndex = result.lowIndex; context.highIndex = result.highIndex; context.paging = result.paging; context.previousViewSize = result.previousViewSize; -context.searchCategory = result.searchCategory; context.searchConstraintStrings = result.searchConstraintStrings; context.searchSortOrderString = result.searchSortOrderString; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy Mon Nov 17 09:11:33 2014 @@ -24,7 +24,7 @@ import org.ofbiz.base.util.*; import org.ofbiz.entity.*; -import org.ofbiz.entity.util.*; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.service.*; import org.ofbiz.product.product.ProductContentWrapper; import org.ofbiz.product.config.ProductConfigWorker; @@ -52,6 +52,14 @@ if (cart.isSalesOrder()) { context.productStoreId = productStoreId; facilityId = productStore.inventoryFacilityId; } + +if (!facilityId) { + productStoreFacility = EntityQuery.use(delegator).select("facilityId").from("ProductStoreFacility").where(UtilMisc.toList(EntityCondition.makeCondition("productStoreId", EntityOperator.EQUALS, productStoreId))).queryFirst(); + if (productStoreFacility) { + facilityId = productStoreFacility.facilityId; + } +} + autoUserLogin = session.getAttribute("autoUserLogin"); userLogin = session.getAttribute("userLogin"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.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/OrderView.groovy?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Mon Nov 17 09:11:33 2014 @@ -25,7 +25,6 @@ import org.ofbiz.entity.condition.*; import org.ofbiz.entity.util.*; import org.ofbiz.base.util.*; import org.ofbiz.base.util.collections.*; -import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.order.order.*; import org.ofbiz.party.contact.*; import org.ofbiz.product.inventory.InventoryWorker; @@ -59,8 +58,8 @@ orderAdjustments = null; comments = null; if (orderId) { - orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); - comments = EntityQuery.use(delegator).select("orderItemSeqId", "changeComments", "changeDatetime", "changeUserLogin").from("OrderItemChange").where(UtilMisc.toList(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId))).orderBy("-changeDatetime").queryList(); + orderHeader = from('OrderHeader').where('orderId', orderId).cache(false).queryFirst(); + comments = select("orderItemSeqId", "changeComments", "changeDatetime", "changeUserLogin").from("OrderItemChange").where(UtilMisc.toList(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId))).orderBy("-changeDatetime").queryList(); } if (orderHeader) { @@ -325,7 +324,7 @@ if (orderHeader) { } // get inventory summary for each shopping cart product item - inventorySummary = dispatcher.runSync("getProductInventorySummaryForItems", [orderItems : orderItems]); + inventorySummary = runService('getProductInventorySummaryForItems', [orderItems : orderItems]) context.availableToPromiseMap = inventorySummary.availableToPromiseMap; context.quantityOnHandMap = inventorySummary.quantityOnHandMap; context.mktgPkgATPMap = inventorySummary.mktgPkgATPMap; @@ -337,7 +336,7 @@ if (orderHeader) { if (productStore) { facility = productStore.getRelatedOne("Facility", false); if (facility) { - inventorySummaryByFacility = dispatcher.runSync("getProductInventorySummaryForItems", [orderItems : orderItems, facilityId : facility.facilityId]); + inventorySummaryByFacility = runService("getProductInventorySummaryForItems", [orderItems : orderItems, facilityId : facility.facilityId]); context.availableToPromiseByFacilityMap = inventorySummaryByFacility.availableToPromiseMap; context.quantityOnHandByFacilityMap = inventorySummaryByFacility.quantityOnHandMap; context.facility = facility; @@ -396,8 +395,7 @@ if (orderHeader) { productionMap = [:]; productIds.each { productId -> if (productId) { // avoid order items without productIds, such as bulk order items - contextInput = [productId : productId, userLogin : userLogin]; - resultOutput = dispatcher.runSync("getProductManufacturingSummaryByFacility", contextInput); + resultOutput = runService("getProductManufacturingSummaryByFacility", [productId : productId]); manufacturingInQuantitySummaryByFacility = resultOutput.summaryInByFacility; Double productionQuantity = 0; manufacturingInQuantitySummaryByFacility.values().each { manQuantity -> @@ -433,7 +431,7 @@ if (orderHeader) { // Get a map of returnable items returnableItems = [:]; - returnableItemServiceMap = dispatcher.runSync("getReturnableItems", [orderId : orderId]); + returnableItemServiceMap = run service: 'getReturnableItems', with: [orderId : orderId] if (returnableItemServiceMap.returnableItems) { returnableItems = returnableItemServiceMap.returnableItems; } @@ -524,7 +522,7 @@ if (shipments) { context.pickedShipmentId = pickedShipmentId; if (pickedShipmentId && shipmentRouteSegment.trackingIdNumber) { if ("UPS" == shipmentRouteSegment.carrierPartyId && productStore) { - resultMap = dispatcher.runSync('upsShipmentAlternateRatesEstimate', [productStoreId: productStore.productStoreId, shipmentId: pickedShipmentId]); + resultMap = runService('upsShipmentAlternateRatesEstimate', [productStoreId: productStore.productStoreId, shipmentId: pickedShipmentId]); shippingRates = resultMap.shippingRates; shippingRateList = []; shippingRates.each { shippingRate -> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/controller.xml Mon Nov 17 09:11:33 2014 @@ -1243,7 +1243,7 @@ under the License. </request-map> <request-map uri="ProfileRemoveUserLoginFromSecurityGroup"> <security https="true" auth="true"/> - <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/> + <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/> <response name="success" type="view" value="ProfileEditUserLoginSecurityGroups"/> <response name="error" type="view" value="ProfileEditUserLoginSecurityGroups"/> </request-map> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/SecurityForms.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/SecurityForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/SecurityForms.xml Mon Nov 17 09:11:33 2014 @@ -114,6 +114,7 @@ under the License. <parameter param-name="userLoginId"/> <parameter param-name="groupId"/> <parameter param-name="fromDate"/> + <parameter param-name="thruDate" from-field="date:nowTimestamp()"/> </hyperlink> </field> </form> @@ -153,6 +154,7 @@ under the License. <parameter param-name="userLoginId"/> <parameter param-name="groupId"/> <parameter param-name="fromDate"/> + <parameter param-name="thruDate" value="${nowTimestamp}"/> </hyperlink> </field> </form> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml Mon Nov 17 09:11:33 2014 @@ -8360,6 +8360,9 @@ <value xml:lang="zh">รฆยฌยขรจยฟยรคยฝยฟรงยยจรฅยยพรงยยรงยฎยกรงยย</value> <value xml:lang="zh_TW">รฆยญยกรจยฟยรคยฝยฟรงยยจรฅยยรงยยรงยฎยกรงยย</value> </property> + <property key="InventoryFacilityIdRequired"> + <value xml:lang="en">"Inventory Facility Id Required"</value> + </property> <property key="MetaDescription"> <value xml:lang="en">Meta Description</value> <value xml:lang="ja">รฃยยกรฃยยฟรจยฉยณรงยดยฐ</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Mon Nov 17 09:11:33 2014 @@ -281,6 +281,7 @@ under the License. <set from-field="parameters.reservedDatetime" field="reserveOisgirMap.reservedDatetime"/> <set from-field="promisedDatetime" field="reserveOisgirMap.promisedDatetime"/> <set from-field="parameters.sequenceId" field="reserveOisgirMap.sequenceId"/> + <set from-field="parameters.priority" field="reserveOisgirMap.priority"/> <call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/> <clear-field field="reserveOisgirMap"/> </else> @@ -363,6 +364,7 @@ under the License. <if-not-empty field="inventoryItemReservation.sequenceId"> <set field="reserveOisgirMap.sequenceId" from-field="inventoryItemReservation.sequenceId"/> </if-not-empty> + <set from-field="parameters.priority" field="reserveOisgirMap.priority"/> <call-service service-name="reserveProductInventory" in-map-name="reserveOisgirMap"/> <clear-field field="reserveOisgirMap"/> </if-not-empty> @@ -385,6 +387,7 @@ under the License. <set field="reserveOisgirMap.sequenceId" from-field="parameters.sequenceId"/> </if-not-empty> <!-- store OrderItemShipGrpInvRes record --> + <set from-field="parameters.priority" field="reserveOisgirMap.priority"/> <call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/> <clear-field field="reserveOisgirMap"/> <field-to-result field="inventoryItem.inventoryItemId" result-name="inventoryItemId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Mon Nov 17 09:11:33 2014 @@ -25,6 +25,15 @@ under the License. <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> + + <if-compare field="parameters.oneInventoryFacility" operator="equals" value="Y"> + <if-empty field="parameters.inventoryFacilityId"> + <add-error> + <fail-property property="InventoryFacilityIdRequired" resource="ProductUiLabels"/> + </add-error> + </if-empty> + <check-errors/> + </if-compare> <if-compare field="parameters.showPricesWithVatTax" operator="equals" value="Y"> <if-empty field="parameters.vatTaxAuthGeoId"> @@ -65,6 +74,15 @@ under the License. <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> </check-permission> <check-errors/> + + <if-compare field="parameters.oneInventoryFacility" operator="equals" value="Y"> + <if-empty field="parameters.inventoryFacilityId"> + <add-error> + <fail-property property="InventoryFacilityIdRequired" resource="ProductUiLabels"/> + </add-error> + </if-empty> + <check-errors/> + </if-compare> <set from-field="parameters.productStoreId" field="lookupPKMap.productStoreId"/> <find-by-primary-key entity-name="ProductStore" map="lookupPKMap" value-field="store"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_facility.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_facility.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_facility.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_facility.xml Mon Nov 17 09:11:33 2014 @@ -315,6 +315,7 @@ under the License. <attribute name="serialNumber" type="String" mode="IN" optional="true"/> <attribute name="sequenceId" type="Long" mode="IN" optional="true"/> <attribute name="promisedDatetime" type="Timestamp" mode="IN" optional="false"/> + <attribute name="priority" type="String" mode="IN" optional="true"/> </service> <service name="reserveProductInventory" engine="simple" @@ -333,6 +334,7 @@ under the License. <attribute name="reserveOrderEnumId" type="String" mode="IN" optional="false"/> <attribute name="sequenceId" type="Long" mode="IN" optional="true"/> <attribute name="lotId" mode="IN" type="String" optional="true" /> + <attribute name="priority" type="String" mode="IN" optional="true"/> <attribute name="quantityNotReserved" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="reserveProductInventoryByFacility" engine="simple" Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java Mon Nov 17 09:11:33 2014 @@ -802,11 +802,11 @@ public class ProductServices { Map<String, Object> successResult = ServiceUtil.returnSuccess(); try { - // Generate new virtual productId, prefix with "VP", put in successResult + // Generate new virtual productId, put in successResult String productId = (String) context.get("productId"); if (UtilValidate.isEmpty(productId)) { - productId = "VP" + delegator.getNextSeqId("Product"); + productId = delegator.getNextSeqId("Product"); // Create new virtual product... GenericValue product = delegator.makeValue("Product"); product.set("productId", productId); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy Mon Nov 17 09:11:33 2014 @@ -47,6 +47,5 @@ context.lowIndex = result.lowIndex; context.highIndex = result.highIndex; context.paging = result.paging; context.previousViewSize = result.previousViewSize; -context.searchCategory = result.searchCategory; context.searchConstraintStrings = result.searchConstraintStrings; context.searchSortOrderString = result.searchSortOrderString; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/keywordsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/keywordsearch.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/keywordsearch.ftl Mon Nov 17 09:11:33 2014 @@ -22,7 +22,7 @@ under the License. </div> <div class="screenlet-body"> <#list searchConstraintStrings as searchConstraintString> - <div> <a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> + <div> <a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N&SEARCH_CATEGORY_ID=${parameters.SEARCH_CATEGORY_ID!}</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> </#list> <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString} <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml Mon Nov 17 09:11:33 2014 @@ -741,7 +741,7 @@ under the License. <!-- defined in an extend in content component to avoid dependencies between common and content <field name="helpContentId" type="id"><description>Used to give contentId which will be shown when help on this page will be called</description></field> --> - <field name="ownerUserLoginId" type="id"></field> + <field name="ownerUserLoginId" type="id-vlong-ne"></field> <field name="originalPortalPageId" type="id"><description>The system portal page this page is derived from</description></field> <field name="parentPortalPageId" type="id"><description>the parent this page is belonging to, normally the startpage of the portal page group</description></field> <field name="sequenceNum" type="numeric"></field> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services_security.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services_security.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services_security.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services_security.xml Mon Nov 17 09:11:33 2014 @@ -83,13 +83,6 @@ under the License. <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/> <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/> </service> - <service name="removeUserLoginFromSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="UserLoginSecurityGroup" auth="true"> - <description>Remove a UserLogin from a SecurityGroup</description> - <permission-service service-name="securityPermissionCheck" main-action="DELETE"/> - <attribute name="userLoginId" type="String" mode="IN" optional="false"/> - <attribute name="groupId" type="String" mode="IN" optional="false"/> - <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/> - </service> <!-- ProtectedView to SecurityGroup services --> <service name="addProtectedViewToSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="ProtectedView" auth="true"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/security-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/security-controller.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/security-controller.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/security-controller.xml Mon Nov 17 09:11:33 2014 @@ -120,7 +120,7 @@ under the License. </request-map> <request-map uri="removeUserLoginFromSecurityGroup"> <security https="true" auth="true"/> - <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/> + <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/> <response name="success" type="view" value="EditSecurityGroupUserLogins"/> <response name="error" type="view" value="EditSecurityGroupUserLogins"/> </request-map> @@ -162,7 +162,7 @@ under the License. </request-map> <request-map uri="userLogin_removeUserLoginFromSecurityGroup"> <security https="true" auth="true"/> - <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/> + <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/> <response name="success" type="view" value="EditUserLoginSecurityGroups"/> <response name="error" type="view" value="EditUserLoginSecurityGroups"/> </request-map> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/SecurityForms.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/SecurityForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/SecurityForms.xml Mon Nov 17 09:11:33 2014 @@ -203,6 +203,7 @@ under the License. <parameter param-name="userLoginId"/> <parameter param-name="groupId"/> <parameter param-name="fromDate"/> + <parameter param-name="thruDate" from-field="date:nowTimestamp()"/> </hyperlink> </field> </form> @@ -245,7 +246,7 @@ under the License. </field> <field name="userLoginId"><hidden/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}" red-when="before-now"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> <hyperlink description="${uiLabelMap.CommonRemove}" target="${removeUserLoginSecurityGroupURI}" also-hidden="false"> @@ -253,6 +254,7 @@ under the License. <parameter param-name="userLoginId"/> <parameter param-name="groupId"/> <parameter param-name="fromDate"/> + <parameter param-name="thruDate" from-field="date:nowTimestamp()"/> </hyperlink> </field> </form> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/entitydef/entitymodel.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/entitydef/entitymodel.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/entitydef/entitymodel.xml Mon Nov 17 09:11:33 2014 @@ -121,7 +121,7 @@ under the License. get a list of tenants per user <entity entity-name="TenantUserLogin" package-name="org.ofbiz.entity.tenant"> <field name="tenantId" type="id-ne"/> - <field name="userLoginId" type="name"/> + <field name="userLoginId" type="id-vlong-ne"/> <field name="fromDate" type="date-time"/> <field name="thruDate" type="date-time"/> <prim-key field="tenantId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java Mon Nov 17 09:11:33 2014 @@ -407,7 +407,7 @@ public class EntityTestSuite extends Ent * Tests findByCondition and tests searching on a view-entity */ public void testCountViews() throws Exception { - delegator.removeByCondition("Testing", EntityCondition.makeCondition("testingId", EntityOperator.LIKE, "TEST-COUNT-VIEW-%")); + delegator.removeByCondition("Testing", EntityCondition.makeCondition("testingTypeId", EntityOperator.EQUALS, "TEST-COUNT-VIEW")); flushAndRecreateTree("count-views"); createNodeMembers("TEST-COUNT-VIEW", "Testing Type #Count", "count-views"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/security/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/security/entitydef/entitymodel.xml?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/security/entitydef/entitymodel.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/security/entitydef/entitymodel.xml Mon Nov 17 09:11:33 2014 @@ -226,7 +226,7 @@ under the License. title="Security Component - Protected View Entity"> <description>Login View couple currently tarpitted : any access to the view for the login is denied</description> <field name="viewNameId" type="id-long-ne"><description>name of view protected from data theft</description></field> - <field name="userLoginId" type="id-ne"/> + <field name="userLoginId" type="id-vlong-ne"/> <field name="tarpitReleaseDateTime" type="numeric"><description>Date/Time at which the login will gain anew access to the view (in milliseconds from midnight, January 1, 1970 UTC , 0 meaning no tarpit to allow the admin to free a view and to keep history</description></field> <prim-key field="viewNameId"/> <prim-key field="userLoginId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy Mon Nov 17 09:11:33 2014 @@ -18,7 +18,8 @@ *******************************************************************************/ package org.ofbiz.service.engine -import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.Debug +import org.ofbiz.entity.util.EntityQuery import org.ofbiz.service.ServiceUtil import org.ofbiz.service.ExecutionServiceException @@ -36,6 +37,10 @@ abstract class GroovyBaseScript extends return result; } + Map run(Map args) throws ExecutionServiceException { + return runService((String)args.get('service'), (Map)args.get('with', new HashMap())); + } + Map makeValue(String entityName) throws ExecutionServiceException { return result = binding.getVariable('delegator').makeValue(entityName); } @@ -52,6 +57,18 @@ abstract class GroovyBaseScript extends return genericValues; } + EntityQuery from(def entity) { + return EntityQuery.use(binding.getVariable('delegator')).from(entity); + } + + EntityQuery select(String... fields) { + return EntityQuery.use(binding.getVariable('delegator')).select(fields); + } + + EntityQuery select(Set<String> fields) { + return EntityQuery.use(binding.getVariable('delegator')).select(fields); + } + def success(String message) { // TODO: implement some clever i18n mechanism based on the userLogin and locale in the binding if (this.binding.hasVariable('request')) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java Mon Nov 17 09:11:33 2014 @@ -72,7 +72,11 @@ public class FormWidgetArtifactInfo exte public void populateAll() throws GeneralException { ArtifactInfoContext infoContext = new ArtifactInfoContext(); ArtifactInfoGatherer infoGatherer = new ArtifactInfoGatherer(infoContext); - infoGatherer.visit(this.modelForm); + try { + infoGatherer.visit(this.modelForm); + } catch (Exception e) { + throw new GeneralException(e); + } populateEntitiesFromNameSet(infoContext.getEntityNames()); populateServicesFromNameSet(infoContext.getServiceNames()); this.populateFormExtended(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java Mon Nov 17 09:11:33 2014 @@ -75,7 +75,11 @@ public class ScreenWidgetArtifactInfo ex public void populateAll() throws GeneralException { ArtifactInfoContext infoContext = new ArtifactInfoContext(); ArtifactInfoGatherer infoGatherer = new ArtifactInfoGatherer(infoContext); - infoGatherer.visit(this.modelScreen); + try { + infoGatherer.visit(this.modelScreen); + } catch (Exception e) { + throw new GeneralException(e); + } populateServicesFromNameSet(infoContext.getServiceNames()); populateEntitiesFromNameSet(infoContext.getEntityNames()); populateFormsFromNameSet(infoContext.getFormLocations()); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidget.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidget.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidget.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidget.java Mon Nov 17 09:11:33 2014 @@ -64,7 +64,7 @@ public abstract class ModelWidget implem this.startLine = ((Integer) widgetElement.getUserData("startLine")).intValue(); } - public abstract void accept(ModelWidgetVisitor visitor); + public abstract void accept(ModelWidgetVisitor visitor) throws Exception; /** * Returns the widget's name. Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetVisitor.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetVisitor.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetVisitor.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetVisitor.java Mon Nov 17 09:11:33 2014 @@ -32,63 +32,63 @@ import org.ofbiz.widget.tree.ModelTree; */ public interface ModelWidgetVisitor { - void visit(HtmlWidget htmlWidget); + void visit(HtmlWidget htmlWidget) throws Exception; - void visit(HtmlWidget.HtmlTemplate htmlTemplate); + void visit(HtmlWidget.HtmlTemplate htmlTemplate) throws Exception; - void visit(HtmlWidget.HtmlTemplateDecorator htmlTemplateDecorator); + void visit(HtmlWidget.HtmlTemplateDecorator htmlTemplateDecorator) throws Exception; - void visit(HtmlWidget.HtmlTemplateDecoratorSection htmlTemplateDecoratorSection); + void visit(HtmlWidget.HtmlTemplateDecoratorSection htmlTemplateDecoratorSection) throws Exception; - void visit(IterateSectionWidget iterateSectionWidget); + void visit(IterateSectionWidget iterateSectionWidget) throws Exception; - void visit(ModelForm modelForm); + void visit(ModelForm modelForm) throws Exception; - void visit(ModelMenu modelMenu); + void visit(ModelMenu modelMenu) throws Exception; - void visit(ModelMenuItem modelMenuItem); + void visit(ModelMenuItem modelMenuItem) throws Exception; - void visit(ModelScreen modelScreen); + void visit(ModelScreen modelScreen) throws Exception; - void visit(ModelScreenWidget.ColumnContainer columnContainer); + void visit(ModelScreenWidget.ColumnContainer columnContainer) throws Exception; - void visit(ModelScreenWidget.Container container); + void visit(ModelScreenWidget.Container container) throws Exception; - void visit(ModelScreenWidget.Content content); + void visit(ModelScreenWidget.Content content) throws Exception; - void visit(ModelScreenWidget.DecoratorScreen decoratorScreen); + void visit(ModelScreenWidget.DecoratorScreen decoratorScreen) throws Exception; - void visit(ModelScreenWidget.DecoratorSection decoratorSection); + void visit(ModelScreenWidget.DecoratorSection decoratorSection) throws Exception; - void visit(ModelScreenWidget.DecoratorSectionInclude decoratorSectionInclude); + void visit(ModelScreenWidget.DecoratorSectionInclude decoratorSectionInclude) throws Exception; - void visit(ModelScreenWidget.Form form); + void visit(ModelScreenWidget.Form form) throws Exception; - void visit(ModelScreenWidget.HorizontalSeparator horizontalSeparator); + void visit(ModelScreenWidget.HorizontalSeparator horizontalSeparator) throws Exception; - void visit(ModelScreenWidget.Image image); + void visit(ModelScreenWidget.Image image) throws Exception; - void visit(ModelScreenWidget.IncludeScreen includeScreen); + void visit(ModelScreenWidget.IncludeScreen includeScreen) throws Exception; - void visit(ModelScreenWidget.Label label); + void visit(ModelScreenWidget.Label label) throws Exception; - void visit(ModelScreenWidget.Link link); + void visit(ModelScreenWidget.Link link) throws Exception; - void visit(ModelScreenWidget.Menu menu); + void visit(ModelScreenWidget.Menu menu) throws Exception; - void visit(ModelScreenWidget.PlatformSpecific platformSpecific); + void visit(ModelScreenWidget.PlatformSpecific platformSpecific) throws Exception; - void visit(ModelScreenWidget.PortalPage portalPage); + void visit(ModelScreenWidget.PortalPage portalPage) throws Exception; - void visit(ModelScreenWidget.Screenlet screenlet); + void visit(ModelScreenWidget.Screenlet screenlet) throws Exception; - void visit(ModelScreenWidget.Section section); + void visit(ModelScreenWidget.Section section) throws Exception; - void visit(ModelScreenWidget.Tree tree); + void visit(ModelScreenWidget.Tree tree) throws Exception; - void visit(ModelTree modelTree); + void visit(ModelTree modelTree) throws Exception; - void visit(ModelTree.ModelNode modelNode); + void visit(ModelTree.ModelNode modelNode) throws Exception; - void visit(ModelTree.ModelNode.ModelSubNode modelSubNode); + void visit(ModelTree.ModelNode.ModelSubNode modelSubNode) throws Exception; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java?rev=1640111&r1=1640110&r2=1640111&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java Mon Nov 17 09:11:33 2014 @@ -37,6 +37,7 @@ import org.ofbiz.widget.ModelWidgetActio import org.ofbiz.widget.ModelWidgetAction.Service; import org.ofbiz.widget.ModelWidgetAction.SetField; import org.ofbiz.widget.ModelWidgetVisitor; +import org.ofbiz.widget.form.FieldInfo; import org.ofbiz.widget.form.ModelForm; import org.ofbiz.widget.form.ModelForm.AltTarget; import org.ofbiz.widget.form.ModelForm.AutoFieldsEntity; @@ -51,7 +52,7 @@ import org.ofbiz.widget.form.ModelFormFi import org.ofbiz.widget.form.ModelFormField.DisplayEntityField; import org.ofbiz.widget.form.ModelFormField.DisplayField; import org.ofbiz.widget.form.ModelFormField.DropDownField; -import org.ofbiz.widget.form.ModelFormField.FieldInfo; +import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions; import org.ofbiz.widget.form.ModelFormField.FileField; import org.ofbiz.widget.form.ModelFormField.HiddenField; import org.ofbiz.widget.form.ModelFormField.HyperlinkField; @@ -163,30 +164,30 @@ public final class ArtifactInfoGatherer } @Override - public void visit(HtmlWidget htmlWidget) { + public void visit(HtmlWidget htmlWidget) throws Exception { } @Override - public void visit(HtmlTemplate htmlTemplate) { + public void visit(HtmlTemplate htmlTemplate) throws Exception { } @Override - public void visit(HtmlTemplateDecorator htmlTemplateDecorator) { + public void visit(HtmlTemplateDecorator htmlTemplateDecorator) throws Exception { } @Override - public void visit(HtmlTemplateDecoratorSection htmlTemplateDecoratorSection) { + public void visit(HtmlTemplateDecoratorSection htmlTemplateDecoratorSection) throws Exception { } @Override - public void visit(IterateSectionWidget iterateSectionWidget) { + public void visit(IterateSectionWidget iterateSectionWidget) throws Exception { for (Section section : iterateSectionWidget.getSectionList()) { section.accept(this); } } @Override - public void visit(ModelForm modelForm) { + public void visit(ModelForm modelForm) throws Exception { if (modelForm.getActions() != null) { for (ModelWidgetAction action : modelForm.getActions()) { action.accept(this); @@ -245,8 +246,8 @@ public final class ArtifactInfoGatherer if (modelFormField.getFieldInfo() instanceof ModelFormField.DisplayEntityField) { infoContext.addEntityName(((ModelFormField.DisplayEntityField) modelFormField.getFieldInfo()).getEntityName()); } - if (modelFormField.getFieldInfo() instanceof ModelFormField.FieldInfoWithOptions) { - for (ModelFormField.OptionSource optionSource : ((ModelFormField.FieldInfoWithOptions) modelFormField + if (modelFormField.getFieldInfo() instanceof FieldInfoWithOptions) { + for (ModelFormField.OptionSource optionSource : ((FieldInfoWithOptions) modelFormField .getFieldInfo()).getOptionSources()) { if (optionSource instanceof ModelFormField.EntityOptions) { infoContext.addEntityName(((ModelFormField.EntityOptions) optionSource).getEntityName()); @@ -280,7 +281,7 @@ public final class ArtifactInfoGatherer } @Override - public void visit(ModelMenu modelMenu) { + public void visit(ModelMenu modelMenu) throws Exception { } @Override @@ -288,18 +289,18 @@ public final class ArtifactInfoGatherer } @Override - public void visit(ModelMenuItem modelMenuItem) { + public void visit(ModelMenuItem modelMenuItem) throws Exception { } @Override - public void visit(ModelScreen modelScreen) { + public void visit(ModelScreen modelScreen) throws Exception { String screenLocation = modelScreen.getSourceLocation().concat("#").concat(modelScreen.getName()); infoContext.addScreenLocation(screenLocation); modelScreen.getSection().accept(this); } @Override - public void visit(ColumnContainer columnContainer) { + public void visit(ColumnContainer columnContainer) throws Exception { for (Column column : columnContainer.getColumns()) { for (ModelScreenWidget widget : column.getSubWidgets()) { widget.accept(this); @@ -308,14 +309,14 @@ public final class ArtifactInfoGatherer } @Override - public void visit(Container container) { + public void visit(Container container) throws Exception { for (ModelScreenWidget widget : container.getSubWidgets()) { widget.accept(this); } } @Override - public void visit(Content content) { + public void visit(Content content) throws Exception { infoContext.addEntityName("Content"); if (!content.getDataResourceId().isEmpty()) { infoContext.addEntityName("DataResource"); @@ -323,47 +324,47 @@ public final class ArtifactInfoGatherer } @Override - public void visit(DecoratorScreen decoratorScreen) { + public void visit(DecoratorScreen decoratorScreen) throws Exception { for (DecoratorSection section : decoratorScreen.getSectionMap().values()) { section.accept(this); } } @Override - public void visit(DecoratorSection decoratorSection) { + public void visit(DecoratorSection decoratorSection) throws Exception { for (ModelScreenWidget widget : decoratorSection.getSubWidgets()) { widget.accept(this); } } @Override - public void visit(DecoratorSectionInclude decoratorSectionInclude) { + public void visit(DecoratorSectionInclude decoratorSectionInclude) throws Exception { } @Override - public void visit(Form form) { + public void visit(Form form) throws Exception { String formLocation = form.getLocation().concat("#").concat(form.getName()); infoContext.addFormLocation(formLocation); } @Override - public void visit(HorizontalSeparator horizontalSeparator) { + public void visit(HorizontalSeparator horizontalSeparator) throws Exception { } @Override - public void visit(Image image) { + public void visit(Image image) throws Exception { } @Override - public void visit(IncludeScreen includeScreen) { + public void visit(IncludeScreen includeScreen) throws Exception { } @Override - public void visit(Label label) { + public void visit(Label label) throws Exception { } @Override - public void visit(Link link) { + public void visit(Link link) throws Exception { String target = link.getTarget(null); String urlMode = link.getUrlMode(); try { @@ -379,26 +380,26 @@ public final class ArtifactInfoGatherer } @Override - public void visit(Menu menu) { + public void visit(Menu menu) throws Exception { } @Override - public void visit(PlatformSpecific platformSpecific) { + public void visit(PlatformSpecific platformSpecific) throws Exception { } @Override - public void visit(PortalPage portalPage) { + public void visit(PortalPage portalPage) throws Exception { } @Override - public void visit(Screenlet screenlet) { + public void visit(Screenlet screenlet) throws Exception { for (ModelScreenWidget widget : screenlet.getSubWidgets()) { widget.accept(this); } } @Override - public void visit(Section section) { + public void visit(Section section) throws Exception { for (ModelWidgetAction action : section.getActions()) { action.accept(this); } @@ -411,19 +412,19 @@ public final class ArtifactInfoGatherer } @Override - public void visit(Tree tree) { + public void visit(Tree tree) throws Exception { } @Override - public void visit(ModelTree modelTree) { + public void visit(ModelTree modelTree) throws Exception { } @Override - public void visit(ModelNode modelNode) { + public void visit(ModelNode modelNode) throws Exception { } @Override - public void visit(ModelSubNode modelSubNode) { + public void visit(ModelSubNode modelSubNode) throws Exception { } @Override |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |