svn commit: r1649482 [24/26] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1649482 [24/26] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumForms.xml Mon Jan 5 08:50:30 2015 @@ -43,7 +43,7 @@ under the License. <field name="imageData" > <file /> </field> - <field name="dataResourceId" > + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> @@ -150,7 +150,7 @@ under the License. <field name="summaryData" > <ignored/> </field> - <field name="dataResourceId" > + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" > <display /> </field> <field name="ftlContentId" position="1"> @@ -179,7 +179,7 @@ under the License. <field name="caContentAssocTypeId" title="${uiLabelMap.FormFieldTitle_contentAssocTypeId}" ><text-find/></field> <field name="caFromDate" title="${uiLabelMap.CommonFromDate}" ><date-find/></field> <field name="contentId"><text-find/></field> - <field name="dataResourceId"><text-find/></field> + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><text-find/></field> <field name="contentName"><text-find/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> <!-- @@ -216,7 +216,7 @@ under the License. <field name="caFromDate" title="From Date" ><display/></field> --> <field name="contentId"><display/></field> - <field name="dataResourceId"><display/></field> + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field> <field name="contentName"><display/></field> </form> @@ -225,7 +225,7 @@ under the License. <field name="imageData" > <file /> </field> - <field name="dataResourceId" > + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> @@ -337,7 +337,7 @@ under the License. <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/> </drop-down> </field> - <field name="dataResourceId"> + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"> <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> @@ -386,7 +386,7 @@ under the License. <form name="DataResourceMaster" target="createDataResource" title="" type="single" default-map-name="currentValue" default-title-style="tableheadtext" default-widget-style="inputBox"> <auto-fields-entity entity-name="DataResource" default-field-type="edit"/> - <field name="dataResourceId"></field> + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"></field> <field name="dataResourceTypeId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/> @@ -429,7 +429,7 @@ under the License. </form> <form name="EditDataResourceText" target="updateDataResourceText" title="" type="single" extends="DataResourceMaster" default-title-style="tableheadtext" default-widget-style="inputBox"> - <field name="dataResourceId"><display/></field> + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field> <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field> <field name="dataResourceTypeIdDisplay" title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId" > <display description="ELECTRONIC_TEXT" also-hidden="false"/> @@ -439,7 +439,7 @@ under the License. </form> <form name="ImageUpload" target="uploadImage" title="" type="upload" default-title-style="tableheadtext" default-widget-style="inputBox"> - <field name="dataResourceId" > + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" > <display description="${currentValue.dataResourceId}"/> </field> <field name="objectInfo" title="${uiLabelMap.EcommerceImageFileName}"> @@ -457,7 +457,7 @@ under the License. <field name="imageData" > <file /> </field> - <field name="dataResourceId" > + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumScreens.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumScreens.xml Mon Jan 5 08:50:30 2015 @@ -85,7 +85,7 @@ under the License. <label style="head1" text="${uiLabelMap.EcommerceMessageListForForum} ${forum.description}"/> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <widgets> <!-- old link converted during URLs securing, seems busted... no time to look at detail...--> @@ -137,7 +137,7 @@ under the License. </container> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <widgets> <label style="blogheader">${uiLabelMap.EcommerceBlogAddResponse}</label> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumTrees.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumTrees.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ForumTrees.xml Mon Jan 5 08:50:30 2015 @@ -21,7 +21,7 @@ under the License. <trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd"> - <tree name="ResponseTree" root-node-name="node-root" + <tree name="ResponseTree" entity-name="Content" root-node-name="node-root" default-render-style="simple" default-wrap-style="responseTreeWrapper"> <node name="node-root" > <entity-one entity-name="Content" use-cache="false" value-field="rsp"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/blog/BlogTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/blog/BlogTrees.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/blog/BlogTrees.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/blog/BlogTrees.xml Mon Jan 5 08:50:30 2015 @@ -19,7 +19,7 @@ --> <trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd"> - <tree name="ResponseTree" root-node-name="node-root" default-render-style="simple" default-wrap-style="responseTreeWrapper"> + <tree name="ResponseTree" entity-name="Content" root-node-name="node-root" default-render-style="simple" default-wrap-style="responseTreeWrapper"> <node name="node-root" entry-name="rsp"> <entity-one entity-name="Content" use-cache="false" value-field="rsp"> <field-map field-name="contentId" from-field="rootEntityId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy Mon Jan 5 08:50:30 2015 @@ -36,8 +36,7 @@ if (fieldValue) { autocompleteOptions = []; if (andExprs) { - entityConditionList = EntityCondition.makeCondition(andExprs, EntityOperator.AND); - autocompleteOptions = delegator.findList("ExampleFeature", entityConditionList, ['exampleFeatureId', 'description'] as Set, ['-exampleFeatureId'], null, false); + autocompleteOptions = select("exampleFeatureId", "description").from("ExampleFeature").where(andExprs).orderBy("-exampleFeatureId").queryList(); //context.autocompleteOptions = autocompleteOptions; request.setAttribute("autocompleteOptions", autocompleteOptions); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy Mon Jan 5 08:50:30 2015 @@ -27,7 +27,7 @@ import javax.servlet.http.HttpSession; defaultLocaleString = ""; if (parameters.productStoreId) { - productStore = delegator.findByAnd("ProductStore", ["productStoreId":parameters.productStoreId], null, false); + productStore = from("ProductStore").where("productStoreId", parameters.productStoreId).queryList(); defaultLocaleString = productStore[0].defaultLocaleString.toString() } active = parameters.ACTIVE_PRODUCT; @@ -37,12 +37,11 @@ productList = FastList.newInstance(); if (UtilValidate.isNotEmpty(productIds) && ("Y".equals(active) || "Y".equals(notSynced))) { for (int i = 0; i < productIds.size(); i++) { productId = productIds[i]; - productCategoryMembers = delegator.findByAnd("ProductCategoryMember", [productId : productId], null, false); - productCategoryMember = EntityUtil.getFirst(productCategoryMembers); + productCategoryMember = from("ProductCategoryMember").where("productId", productId).queryFirst(); if (UtilValidate.isNotEmpty(productCategoryMember)) { if ("Y".equals(active) && "Y".equals(notSynced)) { thruDate = productCategoryMember.get("thruDate"); - goodIdentification = delegator.findOne("GoodIdentification", [productId : productId, goodIdentificationTypeId : "GOOGLE_ID_" + defaultLocaleString], false); + goodIdentification = from("GoodIdentification").where("productId", productId, "goodIdentificationTypeId", "GOOGLE_ID_" + defaultLocaleString).queryOne(); if (UtilValidate.isEmpty(thruDate) && UtilValidate.isEmpty(goodIdentification)) { productList.add(productId); } @@ -53,7 +52,7 @@ if (UtilValidate.isNotEmpty(productIds) } parameters.GOOGLE_SYNCED = "N" } else if ("Y".equals(notSynced)) { - goodIdentification = delegator.findOne("GoodIdentification", [productId : productId, goodIdentificationTypeId : "GOOGLE_ID_" + defaultLocaleString], false); + goodIdentification = from("GoodIdentification").where("productId", productId, "goodIdentificationTypeId", "GOOGLE_ID_" + defaultLocaleString).queryOne(); if (UtilValidate.isEmpty(goodIdentification)) { productList.add(productId); } @@ -71,8 +70,8 @@ if (UtilValidate.isNotEmpty(productIds) def notDiscontProdList = [] if(parameters.DISCONTINUED_PRODUCT == 'Y'){ productIds.each { value -> - def stockIsZero = dispatcher.runSync("isStoreInventoryAvailable", ["productId": value, "productStoreId": parameters.productStoreId, "quantity": BigDecimal.valueOf(1.00)]); - def thisProduct = delegator.findOne("Product", [productId : value], false); + def stockIsZero = runService('isStoreInventoryAvailable', ["productId": value, "productStoreId": parameters.productStoreId, "quantity": BigDecimal.valueOf(1.00)]); + def thisProduct = from("Product").where("productId", value).queryOne(); if (stockIsZero.get("available") == 'Y'){ notDiscontProdList.add(value); }else { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy Mon Jan 5 08:50:30 2015 @@ -31,7 +31,7 @@ if (parameters.productStoreId) { } else { productStoreId = ProductStoreWorker.getProductStoreId(request); } -googleBaseConfigList = delegator.findList("GoogleBaseConfig", null, null, null, null, false); +googleBaseConfigList = from("GoogleBaseConfig").queryList(); if (!productStoreId) { googleBaseProductStore = EntityUtil.getFirst(googleBaseConfigList); productStoreId = googleBaseProductStore.productStoreId; @@ -40,7 +40,7 @@ if (productStoreId) { productStoreCatalogs = CatalogWorker.getStoreCatalogs(delegator, productStoreId); if (productStoreCatalogs) { productStoreCatalogs.each { productStoreCatalog -> - prodCatalog = delegator.findOne("ProdCatalog", [prodCatalogId : productStoreCatalog.prodCatalogId], true); + prodCatalog = from("ProdCatalog").where("prodCatalogId", productStoreCatalog.prodCatalogId).cache(true).queryOne(); prodCatalogList.add(prodCatalog); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy Mon Jan 5 08:50:30 2015 @@ -17,30 +17,30 @@ * under the License. */ import javolution.util.FastList -import org.ofbiz.base.util.UtilProperties +import org.ofbiz.entity.util.EntityUtilProperties configList = [] -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStoreId") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStoreId", delegator) productStoreIds = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.option.outOfStock") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.option.outOfStock", delegator) outOfStock = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.option.backInStock") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.option.backInStock", delegator) backInStock = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.webSiteUrl") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.webSiteUrl", delegator) webSiteUrl = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.actionType") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.actionType", delegator) actionType = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.statusId") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.statusId", delegator) statusId = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.testMode") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.testMode", delegator) testMode = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.webSiteMountPoint") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.webSiteMountPoint", delegator) webSiteMountPoint = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.countryCode") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.countryCode", delegator) countryCode = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.trackingCodeId") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.trackingCodeId", delegator) trackingCodeId = str.split(",") -str = UtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.allowRecommended") +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.allowRecommended", delegator) allowRecommended = str.split(",") productStoreIds.eachWithIndex{ productStoreId, i -> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy Mon Jan 5 08:50:30 2015 @@ -20,7 +20,7 @@ // productList.unique() like distinct sql command, return string type. def productUniqueStr = productList.unique(); def productUniqueStrList = productUniqueStr.toList(); -def googleBaseList = delegator.findByAnd("GoodIdentification",["goodIdentificationTypeId":"GOOGLE_ID_" + productStore.defaultLocaleString], null, false); +def googleBaseList = from("GoodIdentification").where("goodIdentificationTypeId", "GOOGLE_ID_" + productStore.defaultLocaleString).queryList(); // find product is existed in google base. def notNeededList = productUniqueStrList - googleBaseList.productId; def resultList = productUniqueStrList - notNeededList; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsExportToGoogle.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsExportToGoogle.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsExportToGoogle.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsExportToGoogle.groovy Mon Jan 5 08:50:30 2015 @@ -28,9 +28,9 @@ webSiteList = []; webSite = null; if (parameters.productStoreId) { productStoreId = parameters.productStoreId; - webSiteList = delegator.findList("WebSite", EntityCondition.makeCondition("productStoreId", EntityOperator.EQUALS, productStoreId), null, null, null, false); + webSiteList = from("WebSite").where("productStoreId", productStoreId).queryList(); if (parameters.webSiteId) { - webSite = delegator.findOne("WebSite", ["webSiteId" : parameters.webSiteId], true); + webSite = from("WebSite").where("webSiteId", parameters.webSiteId).cache(true).queryOne(); context.webSiteId = parameters.webSiteId; } else if (webSiteList) { webSite = EntityUtil.getFirst(webSiteList); @@ -43,7 +43,7 @@ if (parameters.productStoreId) { } if (parameters.productStoreId) { - productStore = delegator.findByAnd("ProductStore", ["productStoreId":parameters.productStoreId], null, false); + productStore = from("ProductStore").where("productStoreId", parameters.productStoreId).queryList(); str = productStore[0].defaultLocaleString.toString().toUpperCase(); localeString = str.substring(str.length()-2, str.length()); if(localeString.equals("US")){ Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy Mon Jan 5 08:50:30 2015 @@ -33,12 +33,12 @@ categoryIdsTemp = [] if (parameters.productStoreId) { productStoreId = parameters.productStoreId; } -googleBaseConfigList = delegator.findByAnd("GoogleBaseConfig",["productStoreId":productStoreId], null, false); +googleBaseConfigList = from("GoogleBaseConfig").where("productStoreId", productStoreId).queryList(); if (productStoreId) { productStoreCatalogs = CatalogWorker.getStoreCatalogs(delegator, productStoreId); if (productStoreCatalogs) { productStoreCatalogs.each { productStoreCatalog -> - prodCatalog = delegator.findOne("ProdCatalog", [prodCatalogId : productStoreCatalog.prodCatalogId], true); + prodCatalog = from("ProdCatalog").where("prodCatalogId", productStoreCatalog.prodCatalogId).cache(true).queryOne(); prodCatalogList.add(prodCatalog); } } @@ -46,10 +46,10 @@ if (productStoreId) { currentCatalogId = null; prodCatalogList.each { prodCatalogList -> currentCatalogId = prodCatalogList.prodCatalogId - prodCatalogCategoryList = delegator.findByAnd("ProdCatalogCategory",["prodCatalogId":currentCatalogId, "prodCatalogCategoryTypeId":"PCCT_BROWSE_ROOT"], null, false); + prodCatalogCategoryList = from("ProdCatalogCategory").where("prodCatalogId", currentCatalogId, "prodCatalogCategoryTypeId", "PCCT_BROWSE_ROOT").queryList(); topCategory = prodCatalogCategoryList.productCategoryId[0]; if (topCategory){ - relatedCategories = dispatcher.runSync("getRelatedCategories", [parentProductCategoryId: topCategory, userLogin: userLogin]); + relatedCategories = runService('getRelatedCategories', [parentProductCategoryId: topCategory]); categoryList = relatedCategories.categories } else { categoryIdsTemp.clear() Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy Mon Jan 5 08:50:30 2015 @@ -17,4 +17,4 @@ * under the License. */ -context.facilities = delegator.findList("Facility", null, null, null, null, false); +context.facilities = from("Facility").queryList(); Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 5 08:50:30 2015 @@ -2,3 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1535158-1649475 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy Mon Jan 5 08:50:30 2015 @@ -27,11 +27,11 @@ if (!productId) { } if (productId) { - product = delegator.findOne("Product", [productId : productId], true); + product = from("Product").where("productId", productId).cache(true).queryOne(); context.product = product; facilityId = request.getParameter("facilityId"); - resultOutput = dispatcher.runSync("getInventoryAvailableByFacility", [productId : productId, facilityId : facilityId]); + resultOutput = runService('getInventoryAvailableByFacility', [productId : productId, facilityId : facilityId]); quantitySummary = FastMap.newInstance(); quantitySummary.facilityId = facilityId; quantitySummary.atp_qoh = ((Double)resultOutput.availableToPromiseTotal).intValue() + " / " + @@ -40,8 +40,7 @@ if (productId) { // For now this just generates a visual list of locations set against the product for this facility. // todo: Will need to be able to edit and change these values at some point in the future. - productFacilityLocList = delegator.findList("ProductFacilityLocation", - EntityCondition.makeCondition([productId : productId, facilityId : facilityId]), null, null, null, false); + productFacilityLocList = from("ProductFacilityLocation").where("productId", productId, "facilityId", facilityId).queryList(); facStr = null; productFacilityLocList.each { facilityLoc -> if (!facStr) { @@ -55,8 +54,7 @@ if (productId) { // Now we build a list of locations for inventory items against the facility. // todo: change this to a select from inv_items where productId and facilityId matches distinct (locationSeqId). - invItemList = delegator.findList("InventoryItem", - EntityCondition.makeCondition([productId : productId, facilityId : facilityId]), null, null, null, false); + invItemList = from("InventoryItem").where("productId", productId, "facilityId", facilityId).queryList(); locations = FastMap.newInstance(); @@ -80,7 +78,7 @@ if (productId) { locationsIter = locations.keySet().iterator(); while (locationsIter.hasNext()) { location = locationsIter.next(); - resultOutput = dispatcher.runSync("getInventoryAvailableByLocation", [productId : productId, facilityId : facilityId, locationSeqId : location]); + resultOutput = runService('getInventoryAvailableByLocation', [productId : productId, facilityId : facilityId, locationSeqId : location]); quantitySummary = FastMap.newInstance(); quantitySummary.productId = productId; quantitySummary.facilityId = facilityId; Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 5 08:50:30 2015 @@ -2,3 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1535158-1649475 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java Mon Jan 5 08:50:30 2015 @@ -94,7 +94,7 @@ public class LdapLoginWorker extends Log } } - if (!hasBasePermission(userLogin, request) || isFlaggedLoggedOut(userLogin) || hasLdapLoggedOut) { + if (!hasBasePermission(userLogin, request) || isFlaggedLoggedOut(userLogin, userLogin.getDelegator()) || hasLdapLoggedOut) { Debug.logInfo("User does not have permission or is flagged as logged out", module); doBasicLogout(userLogin, request, response); userLogin = null; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/IndexProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/IndexProducts.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/IndexProducts.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/IndexProducts.groovy Mon Jan 5 08:50:30 2015 @@ -29,7 +29,7 @@ if (pi) { beganTransaction = TransactionUtil.begin() EntityListIterator products try { - products = delegator.find('Product', null, null, new TreeSet(['productId']), null, null) + products = select("productId").from("Product").queryIterator(); while (product = products.next()) { pi.queue(new ProductDocument(product.productId)) productsCounter++ Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy Mon Jan 5 08:50:30 2015 @@ -102,7 +102,7 @@ if (searcher) { for (int start = 0; start < collector.getTotalHits(); start++) { Document doc = searcher.doc(hits[start].doc) contentId = doc.get("contentId"); - content = delegator.findOne("Content", [contentId : contentId], true); + content = from("Content").where("contentId", contentId).cache(true).queryOne(); if (!hitSet.contains(contentId)) { contentList.add(content); hitSet.add(contentId); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy Mon Jan 5 08:50:30 2015 @@ -64,7 +64,7 @@ if (parameters.luceneQuery) { hits.each { hit -> Document doc = searcher.doc(hit.doc) productId = doc.productId - product = delegator.findOne("Product", [productId : productId], true) + product = from("Product").where("productId", productId).cache(true).queryOne(); if (product) { productList.add(product) } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Mon Jan 5 08:50:30 2015 @@ -59,7 +59,7 @@ public class OagisInventoryServices { public static final String resource = "OagisUiLabels"; public static final Double doubleZero = new Double(0.0); public static final Double doubleOne = new Double(1.0); - public static final String syncInventoryFacilityId = UtilProperties.getPropertyValue("oagis.properties", "Oagis.Warehouse.SyncInventoryFacilityId"); + public static Map<String, Object> oagisReceiveSyncInventory(DispatchContext ctx, Map<String, Object> context) { Document doc = (Document) context.get("document"); @@ -69,7 +69,7 @@ public class OagisInventoryServices { Locale locale = (Locale) context.get("locale"); List<Map<String, String>> errorMapList = FastList.newInstance(); List<Map<String, Object>> inventoryMapList = FastList.newInstance(); - + final String syncInventoryFacilityId = EntityUtilProperties.getPropertyValue("oagis.properties", "Oagis.Warehouse.SyncInventoryFacilityId", delegator); GenericValue userLogin = null; try { userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java Mon Jan 5 08:50:30 2015 @@ -82,10 +82,6 @@ public class OagisServices { public static final String resource = "OagisUiLabels"; - public static final String certAlias = UtilProperties.getPropertyValue("oagis.properties", "auth.client.certificate.alias"); - public static final String basicAuthUsername = UtilProperties.getPropertyValue("oagis.properties", "auth.basic.username"); - public static final String basicAuthPassword = UtilProperties.getPropertyValue("oagis.properties", "auth.basic.password"); - public static final boolean debugSaveXmlOut = "true".equals(UtilProperties.getPropertyValue("oagis.properties", "Oagis.Debug.Save.Xml.Out")); public static final boolean debugSaveXmlIn = "true".equals(UtilProperties.getPropertyValue("oagis.properties", "Oagis.Debug.Save.Xml.In")); @@ -108,7 +104,7 @@ public class OagisServices { Locale locale = (Locale) context.get("locale"); String errorReferenceId = (String) context.get("referenceId"); List<Map<String, String>> errorMapList = UtilGenerics.checkList(context.get("errorMapList")); - + String sendToUrl = (String) context.get("sendToUrl"); if (UtilValidate.isEmpty(sendToUrl)) { sendToUrl = EntityUtilProperties.getPropertyValue("oagis.properties", "url.send.confirmBod", delegator); @@ -219,7 +215,7 @@ public class OagisServices { Debug.logError(e, errMsg, module); } - Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale); + Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale, delegator); if (sendMessageReturn != null) { return sendMessageReturn; } @@ -679,8 +675,11 @@ public class OagisServices { return result; } - public static Map<String, Object> sendMessageText(String outText, OutputStream out, String sendToUrl, String saveToDirectory, String saveToFilename, Locale locale) { - if (out != null) { + public static Map<String, Object> sendMessageText(String outText, OutputStream out, String sendToUrl, String saveToDirectory, String saveToFilename, Locale locale, Delegator delegator) { + final String certAlias = EntityUtilProperties.getPropertyValue("oagis.properties", "auth.client.certificate.alias", delegator); + final String basicAuthUsername = EntityUtilProperties.getPropertyValue("oagis.properties", "auth.basic.username", delegator); + final String basicAuthPassword = EntityUtilProperties.getPropertyValue("oagis.properties", "auth.basic.password", delegator); + if (out != null) { Writer outWriter = new OutputStreamWriter(out); try { outWriter.write(outText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Mon Jan 5 08:50:30 2015 @@ -80,10 +80,6 @@ public class OagisShipmentServices { public static final String resource = "OagisUiLabels"; - public static final String certAlias = UtilProperties.getPropertyValue("oagis.properties", "auth.client.certificate.alias"); - public static final String basicAuthUsername = UtilProperties.getPropertyValue("oagis.properties", "auth.basic.username"); - public static final String basicAuthPassword = UtilProperties.getPropertyValue("oagis.properties", "auth.basic.password"); - public static final String oagisMainNamespacePrefix = "n"; public static final String oagisSegmentsNamespacePrefix = "os"; public static final String oagisFieldsNamespacePrefix = "of"; @@ -906,7 +902,7 @@ public class OagisShipmentServices { Debug.logError(e, errMsg, module); } - Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale); + Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale, delegator); if (sendMessageReturn != null && ServiceUtil.isError(sendMessageReturn)) { try { Map<String, Object> uomiCtx = FastMap.newInstance(); @@ -1149,7 +1145,7 @@ public class OagisShipmentServices { Debug.logError(e, errMsg, module); } - Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale); + Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale, delegator); if (sendMessageReturn != null && ServiceUtil.isError(sendMessageReturn)) { try { Map<String, Object> uomiCtx = FastMap.newInstance(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy Mon Jan 5 08:50:30 2015 @@ -39,7 +39,7 @@ if (!partyId) { timesheet = null; timesheetId = parameters.timesheetId; if (timesheetId) { - timesheet = delegator.findOne("Timesheet", ["timesheetId" : timesheetId], false); + timesheet = from("Timesheet").where("timesheetId", timesheetId).queryOne(); partyId = timesheet.partyId; // use the party from this timesheet } else { // make sure because of timezone changes, not a duplicate timesheet is created @@ -49,13 +49,13 @@ if (timesheetId) { EntityCondition.makeCondition("thruDate", EntityComparisonOperator.GREATER_THAN, midweek), EntityCondition.makeCondition("partyId", EntityComparisonOperator.EQUALS, partyId) ], EntityOperator.AND); - entryIterator = delegator.find("Timesheet", entryExprs, null, null, null, null); + entryIterator = from("Timesheet").where(entryExprs).queryIterator(); timesheet = entryIterator.next(); entryIterator.close(); if (timesheet == null) { - result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]); + result = runService('createProjectTimesheet', ["userLogin" : parameters.userLogin, "partyId" : partyId]); if (result && result.timesheetId) { - timesheet = delegator.findOne("Timesheet", ["timesheetId" : result.timesheetId], false); + timesheet = from("Timesheet").where("timesheetId", result.timesheetId).queryOne(); } } } @@ -64,9 +64,9 @@ context.timesheet = timesheet; context.weekNumber = UtilDateTime.weekNumber(timesheet.fromDate); // get the user names -context.partyNameView = delegator.findOne("PartyNameView",["partyId" : partyId], false); +context.partyNameView = from("PartyNameView").where("partyId", partyId).queryOne(); // get the default rate for this person -rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"], null, false)); +rateTypes = from("PartyRate").where("partyId", partyId, "defaultRate", "Y").filterByDate().queryList(); if (rateTypes) { context.defaultRateTypeId = rateTypes[0].rateTypeId; } @@ -114,7 +114,7 @@ void retrieveWorkEffortData() { // get project/phase information entry.workEffortId = entryWorkEffort.workEffortId; entry.workEffortName = entryWorkEffort.workEffortName; - result = dispatcher.runSync("getProjectIdAndNameFromTask", ["userLogin" : parameters.userLogin,"taskId" : entryWorkEffort.workEffortId]); + result = runService('getProjectIdAndNameFromTask', ["userLogin" : parameters.userLogin,"taskId" : entryWorkEffort.workEffortId]); entry.phaseId = result.phaseId; entry.phaseName = result.phaseName; entry.projectId = result.projectId; @@ -189,7 +189,7 @@ if (timeEntry) { } context.timeEntries = entries; // get all timesheets of this user, including the planned hours -timesheetsDb = delegator.findByAnd("Timesheet", ["partyId" : partyId], ["fromDate DESC"], false); +timesheetsDb = from("Timesheet").where("partyId", partyId).orderBy("fromDate DESC").queryList(); timesheets = new LinkedList(); timesheetsDb.each { timesheetDb -> timesheet = [:]; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Mon Jan 5 08:50:30 2015 @@ -32,7 +32,7 @@ projectId = parameters.projectId; userLogin = parameters.userLogin; //project info -result = dispatcher.runSync("getProject", [projectId : projectId, userLogin : userLogin]); +result = runService('getProject', [projectId : projectId, userLogin : userLogin]); project = result.projectInfo; if (project && project.startDate) context.chartStart = project.startDate; @@ -46,7 +46,7 @@ else if (project == null) return; ganttList = new LinkedList(); -result = dispatcher.runSync("getProjectPhaseList", [userLogin : userLogin , projectId : projectId]); +result = runService('getProjectPhaseList', [userLogin : userLogin , projectId : projectId]); phases = result.phaseList; if (phases) { phases.each { phase -> @@ -71,10 +71,10 @@ if (phases) { EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "PTS_CANCELLED"), EntityCondition.makeCondition("workEffortParentId", EntityOperator.EQUALS, phase.phaseId) ], EntityOperator.AND); - tasks = delegator.findList("WorkEffort", cond, null, ["sequenceNum","workEffortName"], null, false); + tasks = from("WorkEffort").where(cond).orderBy("sequenceNum","workEffortName").queryList(); if (tasks) { tasks.each { task -> - resultTaskInfo = dispatcher.runSync("getProjectTask", [userLogin : userLogin , taskId : task.workEffortId]); + resultTaskInfo = runService('getProjectTask', [userLogin : userLogin , taskId : task.workEffortId]); taskInfo = resultTaskInfo.taskInfo; taskInfo.taskNr = task.workEffortId; taskInfo.phaseNr = phase.phaseId; @@ -117,7 +117,7 @@ if (phases) { } // dependency can only show one in the ganttchart, so onl show the latest one.. - preTasks = delegator.findByAnd("WorkEffortAssoc", ["workEffortIdTo" : task.workEffortId], ["workEffortIdFrom"], false); + preTasks = from("WorkEffortAssoc").where("workEffortIdTo", task.workEffortId).orderBy("workEffortIdFrom").queryList(); latestTaskIds = new LinkedList(); preTasks.each { preTask -> wf = preTask.getRelatedOne("FromWorkEffort", false); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy Mon Jan 5 08:50:30 2015 @@ -23,13 +23,13 @@ cond = EntityCondition.makeCondition([ EntityCondition.makeCondition ("workEffortTypeId", EntityOperator.EQUALS, "PROJECT"), EntityCondition.makeCondition ("currentStatusId", EntityOperator.NOT_EQUAL, "PRJ_CLOSED") ], EntityJoinOperator.AND); -allProjects = delegator.findList("WorkEffort", cond, (HashSet) ["workEffortId"], ["workEffortName"], null, false); +allProjects = select("workEffortId").from("WorkEffort").where(cond).orderBy("workEffortName").queryList(); projects = []; allProjects.each { project -> - result = dispatcher.runSync("getProject", ["userLogin" : parameters.userLogin, "projectId" : project.workEffortId]); + result = runService('getProject', ["userLogin" : parameters.userLogin, "projectId" : project.workEffortId]); if (result.projectInfo) { - resultAssign = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : parameters.userLogin.partyId, "workEffortId" : project.workEffortId], null, false) + resultAssign = from("WorkEffortPartyAssignment").where("partyId", parameters.userLogin.partyId, "workEffortId", project.workEffortId).queryList(); if (security.hasEntityPermission("PROJECTMGR", "_ADMIN", session) || ((security.hasEntityPermission("PROJECTMGR", "_ROLE_ADMIN", session) || security.hasEntityPermission("PROJECTMGR", "_ROLE_VIEW", session)) && resultAssign)) { projects.add(result.projectInfo); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy Mon Jan 5 08:50:30 2015 @@ -27,16 +27,11 @@ import javolution.util.FastMap; import javolution.util.FastList; -cond = - EntityCondition.makeCondition( - [EntityCondition.makeCondition ("workEffortTypeId", EntityOperator.EQUALS, "PROJECT"), - EntityCondition.makeCondition ("partyId", EntityOperator.EQUALS, parameters.partyId) - ],EntityOperator.AND); -allProjects = delegator.findList("WorkEffortAndPartyAssign", cond, (HashSet) ["workEffortId"], ["workEffortName"], null, true); +allProjects = select("workEffortId").from("WorkEffortAndPartyAssign").where("workEffortTypeId", "PROJECT", "partyId", parameters.partyId).orderBy("workEffortName").cache(true).queryList(); projects = []; allProjects.each { project -> - result = dispatcher.runSync("getProject", ["userLogin" : parameters.userLogin, "projectId" : project.workEffortId, partyId : parameters.partyId]); + result = runService('getProject', ["userLogin" : parameters.userLogin, "projectId" : project.workEffortId, partyId : parameters.partyId]); projects.add(result.projectInfo); } if (projects) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy Mon Jan 5 08:50:30 2015 @@ -32,7 +32,13 @@ entryExprs = ], EntityOperator.AND); orderBy = ["-fromDate"]; // check if latest invoice generated is still in process so allow re-generation to correct errors -entryIterator = delegator.find("ProjectPhaseTaskAndTimeEntryTimeSheet", entryExprs, null, null, orderBy, null); +entryIterator = from("ProjectPhaseTaskAndTimeEntryTimeSheet") + .where(EntityCondition.makeCondition([ + EntityCondition.makeCondition("projectId", EntityOperator.EQUALS, projectId), + EntityCondition.makeCondition("invoiceId", EntityOperator.NOT_EQUAL, null), + ], EntityOperator.AND)) + .orderBy("-fromDate") + .queryIterator(); while (entryItem = entryIterator.next()) { invoice = entryItem.getRelatedOne("Invoice", false); if (invoice.getString("statusId").equals("INVOICE_IN_PROCESS")) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy Mon Jan 5 08:50:30 2015 @@ -19,8 +19,7 @@ import org.ofbiz.entity.util.EntityUtil; -projectMembers = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : context.projectId], null, false); -projectMembers = EntityUtil.filterByDate(projectMembers); +projectMembers = from("WorkEffortPartyAssignment").where("workEffortId", context.projectId).filterByDate().queryList(); toPartyId = null; fromPartyId = null; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy Mon Jan 5 08:50:30 2015 @@ -22,7 +22,7 @@ import org.ofbiz.base.util.*; // get last request from this user and use that project/task assignment as default on the screen -custRequestList = delegator.findByAnd("CustRequest", ["fromPartyId" : fromPartyId], ["-createdDate"], false); +custRequestList = from("CustRequest").where("fromPartyId", fromPartyId).orderBy("-createdDate").queryList(); if (custRequestList) { custReqTaskList = custRequestList.get(0).getRelated("CustRequestWorkEffort", null, null, false); if (custReqTaskList) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy Mon Jan 5 08:50:30 2015 @@ -25,7 +25,7 @@ import javolution.util.FastMap; if (parameters.workEffortId) { workEffortId = parameters.workEffortId; - projects = delegator.findByAnd("ProjectAndPhaseAndTask", UtilMisc.toMap("workEffortId", workEffortId), null, false); + projects = from("ProjectAndPhaseAndTask").where("workEffortId", workEffortId).queryList(); if (UtilValidate.isNotEmpty(projects)) { context.put("projectId", projects.get(0).getString("projectId")); context.put("projectName", projects.get(0).getString("projectName")); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/CustRequestScreens.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/CustRequestScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/CustRequestScreens.xml Mon Jan 5 08:50:30 2015 @@ -24,7 +24,7 @@ under the License. <screen name="ProjectRequestList"> <section> <condition> - <if-has-permission permission="PROJECTMGR" action="ADMIN"/> + <if-has-permission permission="PROJECTMGR" action="_ADMIN"/> </condition> <actions> <entity-and list="custRequests" entity-name="CustRequest"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Mon Jan 5 08:50:30 2015 @@ -912,7 +912,7 @@ </field> <!-- note sure if these two are necessray, but they are kind of confusing in this context: <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> - <field name="dataResourceId"><lookup target-form-name="LookupDataResource"/></field> + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><lookup target-form-name="LookupDataResource"/></field> --> <field name="contentTypeId" use-when="workEffortContent!=null"> <drop-down allow-empty="false" no-current-selected-key="DOCUMENT"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy Mon Jan 5 08:50:30 2015 @@ -28,8 +28,6 @@ import sun.util.calendar.LocalGregorianC def module = "AddProductBacklogItem.groovy"; // find cust request and items -def performFindInMap = [:]; -performFindInMap.entityName = "CustRequestAndCustRequestItem"; def inputFields = [:]; if(parameters.statusId == null){ @@ -39,9 +37,7 @@ if(parameters.statusId == null){ } inputFields.putAll(parameters); inputFields.custRequestTypeId = "RF_PROD_BACKLOG"; -performFindInMap.inputFields = inputFields; -performFindInMap.orderBy = "custSequenceNum"; -def performFindResults = dispatcher.runSync("performFind", performFindInMap); +def performFindResults = runService('performFind', ["entityName": "CustRequestAndCustRequestItem", "inputFields": inputFields, "orderBy": "custSequenceNum"]); def custRequestAndItems = performFindResults.listIt.getCompleteList(); performFindResults.listIt.close(); @@ -54,11 +50,11 @@ custRequestAndItems.each() { custRequest tempCustRequestAndItem.custSequenceNum = countSequence; tempCustRequestAndItem.realSequenceNum = custRequestAndItem.custSequenceNum; // if custRequest has task then get Actual Hours - custWorkEffortList = delegator.findByAnd("CustRequestWorkEffort",["custRequestId" : custRequestAndItem.custRequestId], null, false); + custWorkEffortList = from("CustRequestWorkEffort").where("custRequestId", custRequestAndItem.custRequestId).queryList(); if (custWorkEffortList) { actualHours = 0.00; custWorkEffortList.each() { custWorkEffortMap -> - result = dispatcher.runSync("getScrumActualHour", ["taskId" : custWorkEffortMap.workEffortId,"partyId" : null, "userLogin" : userLogin]); + result = runService('getScrumActualHour', ["taskId" : custWorkEffortMap.workEffortId,"partyId" : null, "userLogin" : userLogin]); actualHours += result.actualHours; } if(actualHours) { @@ -101,9 +97,8 @@ conditions = EntityCondition.makeConditi mainConditionList.add(orConditions); mainConditionList.add(conditions); -mainConditions = EntityCondition.makeCondition(mainConditionList, EntityOperator.AND); -unplannedList = delegator.findList("CustRequestAndCustRequestItem", mainConditions, ["custRequestId", "custSequenceNum", "statusId", "description", "custEstimatedMilliSeconds", "custRequestName", "parentCustRequestId"] as Set, ["custSequenceNum"], null, false); +unplannedList = select("custRequestId", "custSequenceNum", "statusId", "description", "custEstimatedMilliSeconds", "custRequestName", "parentCustRequestId").from("CustRequestAndCustRequestItem").where(mainConditionList).orderBy("custSequenceNum").queryList(); def countSequenceUnplanned = 1; def unplanBacklogItems = []; @@ -113,11 +108,11 @@ unplannedList.each() { unplannedItem -> tempUnplanned.custSequenceNum = countSequenceUnplanned; tempUnplanned.realSequenceNum = unplannedItem.custSequenceNum; // if custRequest has task then get Actual Hours - unplanCustWorkEffortList = delegator.findByAnd("CustRequestWorkEffort",["custRequestId" : unplannedItem.custRequestId], null, false); + unplanCustWorkEffortList = from("CustRequestWorkEffort").where("custRequestId", unplannedItem.custRequestId).queryList(); if (unplanCustWorkEffortList) { actualHours = 0.00; unplanCustWorkEffortList.each() { custWorkEffortMap -> - result = dispatcher.runSync("getScrumActualHour", ["taskId" : custWorkEffortMap.workEffortId,"partyId" : null, "userLogin" : userLogin]); + result = runService('getScrumActualHour', ["taskId" : custWorkEffortMap.workEffortId,"partyId" : null, "userLogin" : userLogin]); actualHours += result.actualHours; } if(actualHours) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy Mon Jan 5 08:50:30 2015 @@ -23,21 +23,21 @@ import org.ofbiz.base.util.Debug; partyId = parameters.partyId // get existing task that no assign projectSprintBacklogAndTaskList = []; -projectAndTaskList = delegator.findByAnd("ProjectSprintBacklogAndTask", ["sprintTypeId" : "SCRUM_SPRINT","taskCurrentStatusId" : "STS_CREATED"], ["taskId DESC"], false); +projectAndTaskList = from("ProjectSprintBacklogAndTask").where("sprintTypeId", "SCRUM_SPRINT","taskCurrentStatusId", "STS_CREATED").orderBy("taskId DESC").queryList(); projectAndTaskList.each { projectAndTaskMap -> userLoginId = userLogin.partyId; projectId = projectAndTaskMap.projectId; - partyAssignmentProjectList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : projectId, "partyId" : partyId], null, false); + partyAssignmentProjectList = from("WorkEffortPartyAssignment").where("workEffortId", projectId, "partyId", partyId).queryList(); partyAssignmentProjectMap = partyAssignmentProjectList[0]; // if this userLoginId is a member of project if (partyAssignmentProjectMap) { sprintId = projectAndTaskMap.sprintId; - partyAssignmentSprintList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : partyId], null, false); + partyAssignmentSprintList = from("WorkEffortPartyAssignment").where("workEffortId", sprintId, "partyId", partyId).queryList(); partyAssignmentSprintMap = partyAssignmentSprintList[0]; // if this userLoginId is a member of sprint if (partyAssignmentSprintMap) { workEffortId = projectAndTaskMap.taskId; - partyAssignmentTaskList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : workEffortId], null, false); + partyAssignmentTaskList = from("WorkEffortPartyAssignment").where("workEffortId", workEffortId).queryList(); partyAssignmentTaskMap = partyAssignmentTaskList[0]; // if the task do not assigned if (!partyAssignmentTaskMap) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy Mon Jan 5 08:50:30 2015 @@ -22,8 +22,8 @@ import org.ofbiz.entity.condition.*; def module = "BacklogNotifications.groovy"; -custRequest = delegator.findOne("CustRequest", ["custRequestId" : custRequestId], false); -person = delegator.findOne("PartyNameView", ["partyId" : partyIdTo], false); +custRequest = from("CustRequest").where("custRequestId", custRequestId).queryOne(); +person = from("PartyNameView").where("partyId", partyIdTo).queryOne(); informationMap = [:]; informationMap.internalName = null; informationMap.productId = null; @@ -31,24 +31,19 @@ informationMap.workEffortName = null; informationMap.workEffortId = null; //check in sprint -andExprs = [EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT"), - EntityCondition.makeCondition("custRequestId", EntityOperator.EQUALS, custRequestId)]; -backlogCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND); -backlogList = delegator.findList("ProductBacklog", backlogCond, ["productId", "workEffortId", "custRequestId"] as Set ,null ,null, false); +backlogList = select("productId", "workEffortId", "custRequestId").from("ProductBacklog").where("workEffortTypeId", "SCRUM_SPRINT", "custRequestId", custRequestId).queryList(); if (backlogList) { - product = delegator.findOne("Product", ["productId" : backlogList[0].productId], false); - sprint = delegator.findOne("WorkEffort", ["workEffortId" : backlogList[0].workEffortId], false); + product = from("Product").where("productId", backlogList[0].productId).queryOne(); + sprint = from("WorkEffort").where("workEffortId", backlogList[0].workEffortId).queryOne(); informationMap.internalName = product.internalName; informationMap.productId = product.productId; informationMap.workEffortName = sprint.workEffortName; informationMap.workEffortId = sprint.workEffortId; } else { - andExprs = [EntityCondition.makeCondition("custRequestId", EntityOperator.EQUALS, custRequestId)]; - backlogCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND); - backlogList = delegator.findList("ProductBacklog", backlogCond, ["productId", "workEffortId", "custRequestId"] as Set ,null ,null, false); + backlogList = select("productId", "workEffortId", "custRequestId").from("ProductBacklog").where("custRequestId", custRequestId).queryList(); if (backlogList) { if (backlogList[0].productId) { - product = delegator.findOne("Product", ["productId" : backlogList[0].productId], false); + product = from("Product").where("productId", backlogList[0].productId).queryOne(); informationMap.internalName = product.internalName; informationMap.productId = product.productId; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |