You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/11/03 07:54:24 UTC
svn commit: r1636282 [20/20] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/content/config/ applications/content/data/
applications/humanres/src/org/ofbiz/humanres/
applications/humanres/webapp/humanres/WEB-INF/ applica...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Mon Nov 3 06:54:16 2014
@@ -1840,7 +1840,7 @@
<value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸µà¹à¸§à¸²à¸à¹à¸à¸</value>
<value xml:lang="vi">SỠgiỠtheo kế hoạch</value>
<value xml:lang="zh">已计åå·¥æ¶</value>
- <value xml:lang="zh_TW">å·²è¨ç«å·¥æ</value>
+ <!--value xml:lang="zh_TW">å·²è¨ç«å·¥æ</value-->
<value xml:lang="zh_TW">å·²è¨åå·¥æ</value>
</property>
<property key="ProjectMgrPrintableNote">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml Mon Nov 3 06:54:16 2014
@@ -75,13 +75,13 @@
<if-compare operator="equals" value="${parameters.custRequestId}"
field="custReq[i].custRequestId">
<if-compare operator="not-equals" value="0" field="i">
- <set field="temp" from-field="custReq[i].custSequenceNum" /><log level="always" message="$$$$$$$$$ temp : ${temp}"></log>
+ <set field="temp" from-field="custReq[i].custSequenceNum" /><!--<log level="always" message="$$$$$$$$$ temp : ${temp}"></log>-->
<set field="custReq[i].custSequenceNum" from-field="custReq[i-1].custSequenceNum" />
<set field="custReq[i-1].custSequenceNum" from-field="temp" />
<entity-one value-field="firstup" entity-name="CustRequest">
<field-map field-name="custRequestId" from-field="custReq[i].custRequestId" />
- </entity-one><log level="always" message="666666666666666666666 firstup : ${firstup}"></log>
+ </entity-one><!--<log level="always" message="666666666666666666666 firstup : ${firstup}"></log>-->
<set field="firstup.custSequenceNum" from-field="custReq[i].custSequenceNum" />
<if-empty field="firstup">
<add-error><fail-message message="Cannot find with ID [${custReq[i].custRequestId}] and custSequenceNum [${custReq[i].custSequenceNum}]"/></add-error>
@@ -322,7 +322,7 @@
<set field="index" value="${getNum-1}" />
<set field="bottomCustReq" from-field="custReq[index]" />
<!-- loop search selected custReq -->
- <loop count="${index}" field="i"><log level="always" message="////////// i : ${i}"></log>
+ <loop count="${index}" field="i"><!--<log level="always" message="////////// i : ${i}"></log>-->
<if-compare-field operator="equals"
field="parameters.custRequestId" to-field="custReq[i].custRequestId">
<set field="selectedCustReq" from-field="custReq[i]" />
@@ -330,7 +330,7 @@
<set field="selectedIndex" from-field="i" />
</if-compare-field>
</loop>
- <loop count="${diffIndex}" field="j"><log level="always" message="////////// j : ${j}"></log>
+ <loop count="${diffIndex}" field="j"><!--<log level="always" message="////////// j : ${j}"></log>-->
<set field="lowerSeqNum" from-field="custReq[j+selectedIndex].custSequenceNum" />
<entity-one value-field="update" entity-name="CustRequest">
@@ -2377,7 +2377,7 @@
</if-not-empty>
</simple-method>
<simple-method method-name="autoSprintNotification" short-description="Auto Sprint Notification">
- <log level="always" message="==========>>> Auto Sprint Notification : ${parameters.sprintStatusId} for sprintId # ${parameters.sprintId}"/>
+ <!--<log level="always" message="==========>>> Auto Sprint Notification : ${parameters.sprintStatusId} for sprintId # ${parameters.sprintId}"/>-->
<if-compare operator="equals" value="SPRINT_ACTIVE" field="parameters.sprintStatusId">
<call-simple-method method-name="checkProductOwnerOfSprint"/>
<if-not-empty field="ownerPartyId">
@@ -2404,7 +2404,7 @@
</if-compare>
</simple-method>
<simple-method method-name="autoBacklogNotification" short-description="Auto backlog Notification">
- <log level="always" message="==========>>> Auto backlog Notification : ${parameters.custRequestStatusId} for custRequestId # ${parameters.custRequestId}"/>
+ <!--<log level="always" message="==========>>> Auto backlog Notification : ${parameters.custRequestStatusId} for custRequestId # ${parameters.custRequestId}"/>-->
<if-compare operator="equals" value="CRQ_ACCEPTED" field="parameters.custRequestStatusId">
<call-simple-method method-name="checkProductOwnerOfBacklog"/>
<if-not-empty field="ownerPartyId">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java Mon Nov 3 06:54:16 2014
@@ -37,6 +37,7 @@ import org.ofbiz.entity.GenericEntityExc
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityOperator;
+import org.ofbiz.entity.util.EntityQuery;
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
@@ -57,7 +58,7 @@ public class ScrumServices {
if (UtilValidate.isNotEmpty(communicationEventId)) {
try {
- GenericValue communicationEvent = delegator.findOne("CommunicationEvent", UtilMisc.toMap("communicationEventId", communicationEventId), false);
+ GenericValue communicationEvent = EntityQuery.use(delegator).from("CommunicationEvent").where("communicationEventId", communicationEventId).queryOne();
if (UtilValidate.isNotEmpty(communicationEvent)) {
String subject = communicationEvent.getString("subject");
if (UtilValidate.isNotEmpty(subject)) {
@@ -70,9 +71,9 @@ public class ScrumServices {
}
String productId = subject.substring(pdLocation + 3, nonDigitLocation);
// Debug.logInfo("=======================Product id found in subject: >>" + custRequestId + "<<", module);
- GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
+ GenericValue product = EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne();
if (UtilValidate.isNotEmpty(product)) {
- GenericValue communicationEventProductMap = delegator.findOne("CommunicationEventProduct", UtilMisc.toMap("productId", productId, "communicationEventId", communicationEventId), false);
+ GenericValue communicationEventProductMap = EntityQuery.use(delegator).from("CommunicationEventProduct").where("productId", productId, "communicationEventId", communicationEventId).queryOne();
if (UtilValidate.isEmpty(communicationEventProductMap)) {
GenericValue communicationEventProduct = delegator.makeValue("CommunicationEventProduct", UtilMisc.toMap("productId", productId, "communicationEventId", communicationEventId));
communicationEventProduct.create();
@@ -284,8 +285,8 @@ public class ScrumServices {
if (UtilValidate.isNotEmpty(exclusions)) {
for (GenericValue contentResourceMap : exclusions) {
Debug.logInfo("Remove contentId ============== >>>>>>>>>>> "+ contentResourceMap.getString("contentId"), module);
- GenericValue dataResourceMap = delegator.findOne("DataResource", UtilMisc.toMap("dataResourceId", contentResourceMap.getString("dataResourceId")), false);
- GenericValue contentMap = delegator.findOne("Content", UtilMisc.toMap("contentId", contentResourceMap.getString("contentId")), false);
+ GenericValue dataResourceMap = EntityQuery.use(delegator).from("DataResource").where("dataResourceId", contentResourceMap.getString("dataResourceId")).queryOne();
+ GenericValue contentMap = EntityQuery.use(delegator).from("Content").where("contentId", contentResourceMap.getString("contentId")).queryOne();
contentMap.removeRelated("WorkEffortContent");
contentMap.removeRelated("ContentRole");
contentMap.remove();
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java?rev=1636282&r1=1636281&r2=1636282&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java Mon Nov 3 06:54:16 2014
@@ -37,6 +37,7 @@ import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityQuery;
import org.ofbiz.order.shoppingcart.ShoppingCart;
import org.ofbiz.order.shoppingcart.ShoppingCartEvents;
import org.ofbiz.order.shoppinglist.ShoppingListEvents;
@@ -161,7 +162,7 @@ public class WebPosEvents {
GenericValue product = null;
try {
String productId = request.getParameter("productId");
- product = delegator.findOne("Product", false, "productId", productId);
+ product = EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne();
if (UtilValidate.isNotEmpty(product)) {
request.setAttribute("product", product);
if (UtilValidate.isNotEmpty(product.getString("isVirtual")) && "Y".equalsIgnoreCase(product.getString("isVirtual"))) {
@@ -187,7 +188,7 @@ public class WebPosEvents {
featureOrder = UtilMisc.toList(featureSet);
for (int i=0; i < featureOrder.size(); i++) {
String featureKey = featureOrder.get(i);
- GenericValue featureValue = delegator.findOne("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId", featureOrder.get(i)), true);
+ GenericValue featureValue = EntityQuery.use(delegator).from("ProductFeatureType").where("productFeatureTypeId", featureOrder.get(i)).cache().queryOne();
if (UtilValidate.isNotEmpty(featureValue) &&
UtilValidate.isNotEmpty(featureValue.get("description"))) {
featureTypes.put(featureKey, featureValue.get("description"));