oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 7.4.16 bugfix

Browse source
This commit is contained in:
JT Smith 2007-11-27 16:17:42 +00:00
parent 1934132002
commit 338efd3df3
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/7.x.x.txt
View file

@ -11,6 +11,8 @@
7.4.16 7.4.16
- fix: EMS - Adding Prerequisite sets. - fix: EMS - Adding Prerequisite sets.
- fix: Multiple Instances of EMS displaying on View Purchase
7.4.15 7.4.15
- fix: Image asset test fails - fix: Image asset test fails

4
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -2985,8 +2985,8 @@ sub www_managePurchases {
return $self->www_viewPurchase unless $isAdmin; return $self->www_viewPurchase unless $isAdmin;
my $i18n = WebGUI::International->new($self->session,'Asset_EventManagementSystem'); my $i18n = WebGUI::International->new($self->session,'Asset_EventManagementSystem');
my $whereClause = ($isAdmin)?'':" and (t.userId='".$self->session->user->userId."' or b.userId='".$self->session->user->userId."' or b.createdByUserId='".$self->session->user->userId."') and e.endDate > '".$self->session->datetime->time()."'"; my $whereClause = ($isAdmin)?'':" and (t.userId='".$self->session->user->userId."' or b.userId='".$self->session->user->userId."' or b.createdByUserId='".$self->session->user->userId."') and e.endDate > '".$self->session->datetime->time()."'";
my $sql = "select distinct(t.transactionId) as purchaseId, t.initDate as initDate from transaction as t, EventManagementSystem_purchases as p, EventManagementSystem_registrations as r, EventManagementSystem_badges as b, EventManagementSystem_products as e where p.transactionId=t.transactionId and b.badgeId=r.badgeId and t.status='Completed' and p.purchaseId=r.purchaseId and r.productId=e.productId $whereClause order by t.initDate"; my $sql = "select distinct(t.transactionId) as purchaseId, t.initDate as initDate from transaction as t, EventManagementSystem_purchases as p, EventManagementSystem_registrations as r, EventManagementSystem_badges as b, EventManagementSystem_products as e where p.transactionId=t.transactionId and b.badgeId=r.badgeId and t.status='Completed' and p.purchaseId=r.purchaseId and r.productId=e.productId and r.assetId=? $whereClause order by t.initDate";
my $sth = $self->session->db->read($sql); my $sth = $self->session->db->read($sql,[$self->getId]);
my @purchasesLoop; my @purchasesLoop;
while (my $purchase = $sth->hashRef) { while (my $purchase = $sth->hashRef) {
$purchase->{datePurchasedHuman} = $self->session->datetime->epochToHuman($purchase->{initDate}); $purchase->{datePurchasedHuman} = $self->session->datetime->epochToHuman($purchase->{initDate});