svn commit: r1337683 - in /ofbiz/trunk/specialpurpose/scrum: src/org/ofbiz/scrum/ webapp/scrum/WEB-INF/actions/ webapp/scrum/reports/

[doogie-3]

Author: doogie
Date: Sat May 12 21:21:48 2012
New Revision: 1337683

URL: http://svn.apache.org/viewvc?rev=1337683&view=rev
Log:
DEPRECATION: specialpurpose/scrum: findByPrimaryKey variants replaced
with findOne

Modified:
    ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign

Modified: ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java (original)
+++ ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java Sat May 12 21:21:48 2012
@@ -65,7 +65,7 @@ public class ScrumServices {
 
         if (UtilValidate.isNotEmpty(communicationEventId)) {
             try {
-                GenericValue communicationEvent = delegator.findByPrimaryKey("CommunicationEvent", UtilMisc.toMap("communicationEventId", communicationEventId));
+                GenericValue communicationEvent = delegator.findOne("CommunicationEvent", UtilMisc.toMap("communicationEventId", communicationEventId), false);
                 if (UtilValidate.isNotEmpty(communicationEvent)) {
                     String subject = communicationEvent.getString("subject");
                     if (UtilValidate.isNotEmpty(subject)) {
@@ -78,9 +78,9 @@ public class ScrumServices {
                             }
                             String productId = subject.substring(pdLocation + 3, nonDigitLocation);
                             // Debug.logInfo("=======================Product id found in subject: >>" + custRequestId + "<<", module);
-                            GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
+                            GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false);
                             if (UtilValidate.isNotEmpty(product)) {
-                                GenericValue communicationEventProductMap = delegator.findByPrimaryKey("CommunicationEventProduct", UtilMisc.toMap("productId", productId, "communicationEventId", communicationEventId));
+                                GenericValue communicationEventProductMap = delegator.findOne("CommunicationEventProduct", UtilMisc.toMap("productId", productId, "communicationEventId", communicationEventId), false);
                                 if (UtilValidate.isEmpty(communicationEventProductMap)) {
                                     GenericValue communicationEventProduct = delegator.makeValue("CommunicationEventProduct", UtilMisc.toMap("productId", productId, "communicationEventId", communicationEventId));
                                     communicationEventProduct.create();
@@ -291,8 +291,8 @@ public class ScrumServices {
                 if (UtilValidate.isNotEmpty(exclusions)) {
                     for (GenericValue contentResourceMap : exclusions) {
                         Debug.logInfo("Remove contentId ============== >>>>>>>>>>> "+ contentResourceMap.getString("contentId"), module);
-                        GenericValue dataResourceMap = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", contentResourceMap.getString("dataResourceId")));
-                        GenericValue contentMap = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentResourceMap.getString("contentId")));
+                        GenericValue dataResourceMap = delegator.findOne("DataResource", UtilMisc.toMap("dataResourceId", contentResourceMap.getString("dataResourceId")), false);
+                        GenericValue contentMap = delegator.findOne("Content", UtilMisc.toMap("contentId", contentResourceMap.getString("contentId")), false);
                         contentMap.removeRelated("WorkEffortContent");
                         contentMap.removeRelated("ContentRole");
                         contentMap.remove();

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy Sat May 12 21:21:48 2012
@@ -22,8 +22,8 @@ import org.ofbiz.entity.condition.*;
 
 def module = "BacklogNotifications.groovy";
 
-custRequest = delegator.findByPrimaryKey("CustRequest", ["custRequestId" : custRequestId]);
-person = delegator.findByPrimaryKey("PartyNameView", ["partyId" : partyIdTo]);
+custRequest = delegator.findOne("CustRequest", ["custRequestId" : custRequestId], false);
+person = delegator.findOne("PartyNameView", ["partyId" : partyIdTo], false);
 informationMap = [:];
 informationMap.internalName = null;
 informationMap.productId = null;
@@ -36,8 +36,8 @@ andExprs = [EntityCondition.makeConditio
 backlogCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
 backlogList = delegator.findList("ProductBacklog", backlogCond, ["productId", "workEffortId", "custRequestId"] as Set ,null ,null, false);
 if (backlogList) {
-    product = delegator.findByPrimaryKey("Product", ["productId" : backlogList[0].productId]);
-    sprint = delegator.findByPrimaryKey("WorkEffort", ["workEffortId" : backlogList[0].workEffortId]);
+    product = delegator.findOne("Product", ["productId" : backlogList[0].productId], false);
+    sprint = delegator.findOne("WorkEffort", ["workEffortId" : backlogList[0].workEffortId], false);
     informationMap.internalName = product.internalName;
     informationMap.productId = product.productId;
     informationMap.workEffortName = sprint.workEffortName;
@@ -48,7 +48,7 @@ if (backlogList) {
     backlogList = delegator.findList("ProductBacklog", backlogCond, ["productId", "workEffortId", "custRequestId"] as Set ,null ,null, false);
     if (backlogList) {
         if (backlogList[0].productId) {
-            product = delegator.findByPrimaryKey("Product", ["productId" : backlogList[0].productId]);
+            product = delegator.findOne("Product", ["productId" : backlogList[0].productId], false);
             informationMap.internalName = product.internalName;
             informationMap.productId = product.productId;
         }

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy Sat May 12 21:21:48 2012
@@ -40,7 +40,7 @@ if (!partyId) {
 timesheet = null;
 timesheetId = parameters.timesheetId;
 if (timesheetId) {
-    timesheet = delegator.findByPrimaryKey("Timesheet", ["timesheetId" : timesheetId]);
+    timesheet = delegator.findOne("Timesheet", ["timesheetId" : timesheetId], false);
     partyId = timesheet.partyId; // use the party from this timesheet
 } else {
     // make sure because of timezone changes, not a duplicate timesheet is created
@@ -56,7 +56,7 @@ if (timesheetId) {
     if (timesheet == null) {
         result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]);
         if (result && result.timesheetId) {
-            timesheet = delegator.findByPrimaryKey("Timesheet", ["timesheetId" : result.timesheetId]);
+            timesheet = delegator.findOne("Timesheet", ["timesheetId" : result.timesheetId], false);
         }
     }
 }
@@ -65,7 +65,7 @@ context.timesheet = timesheet;
 context.weekNumber = UtilDateTime.weekNumber(timesheet.fromDate);
 
 // get the user names
-context.partyNameView = delegator.findByPrimaryKey("PartyNameView",["partyId" : partyId]);
+context.partyNameView = delegator.findOne("PartyNameView",["partyId" : partyId], false);
 // get the default rate for this person
 rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"]));
 if (rateTypes) {
@@ -433,7 +433,7 @@ if (backlogIndexList) {
             custRequestItemList = custRequestMap.getRelated("CustRequestItem");
  custRequestItem =  
  productOut = custRequestItemList[0].productId;
- product = delegator.findByPrimaryKey("Product", ["productId" : productOut]);
+ product = delegator.findOne("Product", ["productId" : productOut], false);
             backlogIndex.each { backlogProduct ->
                 productId = backlogProduct
                 if (productId.equals(productOut)) {
@@ -444,7 +444,7 @@ if (backlogIndexList) {
                         // if the task do not assigned
                         if (!partyAssignmentTaskMap) {
                             result = [:];
-                            workEffortMap = delegator.findByPrimaryKey("WorkEffort", ["workEffortId" : custRequestWorkEffortMap.workEffortId]);
+                            workEffortMap = delegator.findOne("WorkEffort", ["workEffortId" : custRequestWorkEffortMap.workEffortId], false);
                             result.description = custRequestMap.description;
                             result.productName = product.internalName;
                             result.taskId = workEffortMap.workEffortId;

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy Sat May 12 21:21:48 2012
@@ -39,7 +39,7 @@ if (!partyId) {
 timesheet = null;
 timesheetId = parameters.timesheetId;
 if (timesheetId) {
-    timesheet = delegator.findByPrimaryKey("Timesheet", ["timesheetId" : timesheetId]);
+    timesheet = delegator.findOne("Timesheet", ["timesheetId" : timesheetId], false);
     partyId = timesheet.partyId; // use the party from this timesheet
 } else {
     // make sure because of timezone changes, not a duplicate timesheet is created
@@ -55,7 +55,7 @@ if (timesheetId) {
     if (timesheet == null) {
         result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]);
         if (result && result.timesheetId) {
-            timesheet = delegator.findByPrimaryKey("Timesheet", ["timesheetId" : result.timesheetId]);
+            timesheet = delegator.findOne("Timesheet", ["timesheetId" : result.timesheetId], false);
         }
     }
 }
@@ -64,7 +64,7 @@ context.timesheet = timesheet;
 context.weekNumber = UtilDateTime.weekNumber(timesheet.fromDate);
 
 // get the user names
-context.partyNameView = delegator.findByPrimaryKey("PartyNameView",["partyId" : partyId]);
+context.partyNameView = delegator.findOne("PartyNameView",["partyId" : partyId], false);
 // get the default rate for this person
 rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"]));
 if (rateTypes) {

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy Sat May 12 21:21:48 2012
@@ -51,7 +51,7 @@ custRequestList.each { custRequestListMa
         taskBacklogList.each { taskBacklogMap ->
             taskId = taskBacklogMap.workEffortId;
             
-            task = delegator.findByPrimaryKey("WorkEffort", ["workEffortId" : taskId]);
+            task = delegator.findOne("WorkEffort", ["workEffortId" : taskId], false);
             if (task.workEffortTypeId == "SCRUM_TASK_IMPL") {
                 countImplTask+=1;
                 if ( task.currentStatusId == "STS_COMPLETED" || task.currentStatusId == "STS_CANCELLED") {

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy Sat May 12 21:21:48 2012
@@ -74,7 +74,7 @@ if (userLogin) {
     boolean addAllProducts = false;
     allProducts.each { product ->
         product = product.getAllFields();
-        productMap = delegator.findByPrimaryKey("Product", ["productId" : product.productId]);    
+        productMap = delegator.findOne("Product", ["productId" : product.productId], false);    
         product.put("longDescription",productMap.longDescription)
         if(security.hasEntityPermission("SCRUM", "_ADMIN", session)){
             addAllProducts = true;

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy Sat May 12 21:21:48 2012
@@ -49,7 +49,7 @@ allSprints.each { sprint ->
     sprint = sprint.getAllFields();
     sprint.put("companyId", companyId)
     sprint.put("companyName", companyName)
-    product = delegator.findByPrimaryKey("Product",["productId" : sprint.productId]);
+    product = delegator.findOne("Product",["productId" : sprint.productId], false);
     productName = "";
     if (product != null) productName = product.internalName;
     sprint.put("productName", productName);

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy Sat May 12 21:21:48 2012
@@ -32,9 +32,9 @@ now = UtilDateTime.nowTimestamp();
 try{
     if (UtilValidate.isNotEmpty(loginPartyId)) {
         if (UtilValidate.isNotEmpty(productId)) {
-        context.product = delegator.findByPrimaryKey("Product",["productId" : productId]);
+        context.product = delegator.findOne("Product",["productId" : productId], false);
         }
-        communicationEvent = delegator.findByPrimaryKey("CommunicationEvent",["communicationEventId" : communicationEventId]);
+        communicationEvent = delegator.findOne("CommunicationEvent",["communicationEventId" : communicationEventId], false);
         communicationEvent.communicationEventTypeId = "EMAIL_COMMUNICATION";
         communicationEvent.contactMechTypeId = "EMAIL_ADDRESS";
         communicationEvent.datetimeStarted = now;
@@ -45,7 +45,7 @@ try{
             // for owner
             productRole = delegator.findByAnd("ProductRole",["productId" : productId,"roleTypeId" : "PRODUCT_OWNER"]);
             context.productOwnerId = productRole[0].partyId
-            parentCom = delegator.findByPrimaryKey("CommunicationEvent",["communicationEventId" : communicationEventId]);
+            parentCom = delegator.findOne("CommunicationEvent",["communicationEventId" : communicationEventId], false);
             if (parentCom) {
                 context.partyIdFrom = productRole[0].partyId;
             } else {
@@ -80,7 +80,7 @@ try{
             // for owner
             productRole = delegator.findByAnd("ProductRole",["productId" : productId,"roleTypeId" : "PRODUCT_OWNER"]);
             context.productOwnerId = productRole[0].partyId;
-            parentCom = delegator.findByPrimaryKey("CommunicationEvent",["communicationEventId" : communicationEventId]);
+            parentCom = delegator.findOne("CommunicationEvent",["communicationEventId" : communicationEventId], false);
             if(parentCom){
                 context.partyIdTo = productRole[0].partyId;
             } else {

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy Sat May 12 21:21:48 2012
@@ -32,7 +32,7 @@ try{
                projectMap = projectList[0];
                // make sure that project dose not closed
                if (projectMap.currentStatusId != "SPJ_CLOSED") {
-                   productMap = delegator.findByPrimaryKey("Product",["productId" : projectMap.productId]);
+                   productMap = delegator.findOne("Product",["productId" : projectMap.productId], false);
                    workEffortMap.productId = productMap.productId;
                    workEffortMap.internalName = returnNameAsString(productMap.internalName,30);
                    workEffortMap.projectId = projectMap.workEffortId;
@@ -68,7 +68,7 @@ try{
             inputMap = [:];
             productIdIn = categoryMap.productId;
             if (productIdIn) {
-               productMap = delegator.findByPrimaryKey("Product",["productId" : productIdIn]);
+               productMap = delegator.findOne("Product",["productId" : productIdIn], false);
                inputMap.productId = productMap.productId;
                inputMap.internalName = productMap.internalName;
                inputMap.custRequestId = categoryMap.custRequestId;

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy Sat May 12 21:21:48 2012
@@ -45,7 +45,7 @@ taskUnplanList.each { taskUnplanMap ->
  productlist = delegator.findByAnd("CustRequestItem", ["custRequestId" : custRequestId],["productId"]);
  productlist.each { productMap ->
  productId = productMap.productId;
- product = delegator.findByPrimaryKey("Product",["productId":productId]);
+ product = delegator.findOne("Product",["productId":productId], false);
  productName = product.internalName;
  unplanMap.taskId = taskUnplanMap.taskId;
  unplanMap.taskName = taskUnplanMap.taskName;
@@ -89,7 +89,7 @@ taskPlanList.each { taskPlanMap ->
         } else {
             custRequestId = taskPlanMap.custRequestId;
             productlist = delegator.findByAnd("CustRequestItem", ["custRequestId" : custRequestId],["productId"]);
-            product = delegator.findByPrimaryKey("Product",["productId":productlist[0].productId]);
+            product = delegator.findOne("Product",["productId":productlist[0].productId], false);
             productName = product.internalName;
             planMap.taskId = taskPlanMap.taskId;
             planMap.taskTypeId = taskPlanMap.taskTypeId;

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign Sat May 12 21:21:48 2012
@@ -102,7 +102,7 @@ inputFinishedData =  FastMap.newInstance
 
 try{
 
-        userLogin = delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin"));
+        userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false);
         inputOpenData.put("userLogin",userLogin);
         inputOpenData.put("productId",productId);
         inputOpenData.put("statusId","CRQ_ACCEPTED");

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign Sat May 12 21:21:48 2012
@@ -102,7 +102,7 @@ inputFinishedData =  FastMap.newInstance
 
 try{
 
-        userLogin = delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin"));
+        userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false);
         inputOpenData.put("userLogin",userLogin);
         inputOpenData.put("productId",productId);
         inputOpenData.put("statusId","CRQ_ACCEPTED");

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign?rev=1337683&r1=1337682&r2=1337683&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign Sat May 12 21:21:48 2012
@@ -37,7 +37,7 @@ estimatedHrs = params["estimatedHrs"].va
 maxHours = params["maxHours"].value;
 currentDay = -1;
 
-userLogin = delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin"));
+userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false);
 // caculate average diff hours
 var holidayNumber = BigDecimal.ZERO;
 var notHolidayNumber = BigDecimal.ZERO;