svn commit: r1338407 - in /ofbiz/trunk/applications/humanres: src/org/ofbiz/humanres/HumanResEvents.java webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy widget/forms/RecruitmentForms.xml

[doogie-3]

Author: doogie
Date: Mon May 14 21:00:43 2012
New Revision: 1338407

URL: http://svn.apache.org/viewvc?rev=1338407&view=rev
Log:
DEPRECATION: applications/humanres: findByAnd variants replaced with findByAnd that takes a boolean useCache parameter.

Modified:
    ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy
    ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml

Modified: ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java?rev=1338407&r1=1338406&r2=1338407&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java (original)
+++ ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java Mon May 14 21:00:43 2012
@@ -62,11 +62,11 @@ public class HumanResEvents {
         //check employee position
         try {
             List<GenericValue> isEmpl = delegator.findByAnd("EmplPosition", UtilMisc.toMap(
-                    "emplPositionId", partyId));
+                    "emplPositionId", partyId), null, false);
             if (UtilValidate.isNotEmpty(isEmpl)) {
                 String emplId = partyId;
                 List<GenericValue> emlpfillCtxs = EntityUtil.filterByDate(delegator.findByAnd("EmplPositionFulfillment", UtilMisc.toMap(
-                        "emplPositionId", emplId)));
+                        "emplPositionId", emplId), null, false));
                 if (UtilValidate.isNotEmpty(emlpfillCtxs)) {
                     for (GenericValue emlpfillCtx : emlpfillCtxs ) {
                         String memberId = emlpfillCtx.getString("partyId");
@@ -120,7 +120,7 @@ public class HumanResEvents {
             GenericValue partyGroup = delegator.findOne("PartyGroup" ,UtilMisc.toMap("partyId", partyId), false);
             if (UtilValidate.isNotEmpty(partyGroup)) {
                 childOfComs = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", UtilMisc.toMap(
-                        "partyIdFrom", partyGroup.get("partyId"), "partyRelationshipTypeId", "GROUP_ROLLUP")));
+                        "partyIdFrom", partyGroup.get("partyId"), "partyRelationshipTypeId", "GROUP_ROLLUP"), null, false));
                 if (UtilValidate.isNotEmpty(childOfComs)) {
                     
                     for (GenericValue childOfCom : childOfComs ) {
@@ -145,10 +145,10 @@ public class HumanResEvents {
                         }
                         //Check child existing
                         List<GenericValue> childOfSubComs = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", UtilMisc.toMap(
-                                "partyIdFrom", catId, "partyRelationshipTypeId", "GROUP_ROLLUP")));
+                                "partyIdFrom", catId, "partyRelationshipTypeId", "GROUP_ROLLUP"), null, false));
                         //check employee position
                         List<GenericValue> isPosition = delegator.findByAnd("EmplPosition", UtilMisc.toMap(
-                                "partyId", catId));
+                                "partyId", catId), null, false);
                         if (UtilValidate.isNotEmpty(childOfSubComs) || UtilValidate.isNotEmpty(isPosition)) {
                             josonMap.put("state", "closed");
                         }
@@ -211,7 +211,7 @@ public class HumanResEvents {
                         String typeId = (String) childOfEmpl.get("emplPositionTypeId");
                         //check child
                         List<GenericValue> emlpfCtxs = EntityUtil.filterByDate(delegator.findByAnd("EmplPositionFulfillment", UtilMisc.toMap(
-                                "emplPositionId", emplId)));
+                                "emplPositionId", emplId), null, false));
                         if (UtilValidate.isNotEmpty(emlpfCtxs)) {
                             emplMap.put("state", "closed");
                         }

Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy?rev=1338407&r1=1338406&r2=1338407&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy Mon May 14 21:00:43 2012
@@ -41,7 +41,7 @@ existParties =  FastList.newInstance();
 subtopLists =  FastList.newInstance();
 
 //internalOrg list
-partyRelationships = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", [partyIdFrom : partyId, partyRelationshipTypeId : "GROUP_ROLLUP"]));
+partyRelationships = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", [partyIdFrom : partyId, partyRelationshipTypeId : "GROUP_ROLLUP"], null, false));
 if (partyRelationships) {
     //root
     partyRoot = delegator.findOne("PartyGroup", [partyId : partyId], false);

Modified: ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml?rev=1338407&r1=1338406&r2=1338407&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml Mon May 14 21:00:43 2012
@@ -449,7 +449,7 @@ under the License.
                 import org.ofbiz.entity.GenericValue;
                 import org.ofbiz.base.util.UtilMisc;
                 import org.ofbiz.entity.util.EntityUtil;
-                GenericValue partyAndPostalAddress = EntityUtil.getFirst(delegator.findByAnd(&quot;PartyAndPostalAddress&quot;,UtilMisc.toMap(&quot;partyId&quot;,internalOrganisation)));
+                GenericValue partyAndPostalAddress = EntityUtil.getFirst(delegator.findByAnd(&quot;PartyAndPostalAddress&quot;,UtilMisc.toMap(&quot;partyId&quot;,internalOrganisation), null, false));
                 if(partyAndPostalAddress==null) return ;
                 if(partyAndPostalAddress!=null) city = partyAndPostalAddress.getString(&quot;city&quot;);
                 return city;