From 01bfe673ae1debb6466fa4688eba7391690ed03e Mon Sep 17 00:00:00 2001 From: Eric Kennedy Date: Thu, 5 Oct 2006 20:45:52 +0000 Subject: [PATCH] fix: Error Displaying Multiple TimeTracking Wobjects --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/TimeTracking.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 4e5eac4f9..06fb0de90 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -3,6 +3,7 @@ - fix: adding Matrix listings committing the current version tag - fix: user searches in task resource additions in PM not displaying right without both last name and first name present - fix: task editor in PM not actually receiving start/end date information at first +- fix: Error Displaying Multiple TimeTracking Wobjects (ekennedy) 7.0.9 - Removed the need for DateTime::Cron::Simple, which also added the ability diff --git a/lib/WebGUI/Asset/Wobject/TimeTracking.pm b/lib/WebGUI/Asset/Wobject/TimeTracking.pm index 67c6490ce..6610bc003 100644 --- a/lib/WebGUI/Asset/Wobject/TimeTracking.pm +++ b/lib/WebGUI/Asset/Wobject/TimeTracking.pm @@ -671,7 +671,7 @@ sub www_buildTimeTable { my $resourceIdFromForm = $form->get("resourceId"); my $resourceId = ($user->isInGroup($self->get("groupToManage")) && $resourceIdFromForm)?$resourceIdFromForm:$user->userId; #Build Report Info - my $report = $db->quickHashRef("select * from TT_report where resourceId=? and startDate=? and endDate=?",[$resourceId,$weekStart,$weekEnd]); + my $report = $db->quickHashRef("select * from TT_report where resourceId=? and assetId=? and startDate=? and endDate=?",[$resourceId,$self->getId,$weekStart,$weekEnd]); my $reportId = $report->{reportId}; #$eh->warn($reportId); #Add Report Stuff to form header