From e7e85e1f1410cc50757d8f7b0d5f2cd9f38f764f Mon Sep 17 00:00:00 2001 From: Roy Johnson Date: Thu, 27 Apr 2006 01:22:46 +0000 Subject: [PATCH] Bug fixin' part deux --- lib/WebGUI/Asset/Wobject/EventManagementSystem.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index 0e37ce6ce..731b0ac05 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -326,7 +326,7 @@ sub checkConflicts { # make sure it's a subevent... my ($isSubEvent) = $self->session->db->quickArray(" select count(*) from EventManagementSystem_products - where prerequisiteId is not null and productId=?", [$scheduleData->{productId}] + where (prerequisiteId is not null or prerequisiteId != '') and productId=?", [$scheduleData->{productId}] ); next unless ($isSubEvent); @@ -2800,7 +2800,7 @@ sub view { where p.productId = e.productId and approved=1 and e.assetId =".$self->session->db->quote($self->get("assetId"))." - and e.prerequisiteId is NULL"; + and (e.prerequisiteId is NULL or e.prerequisiteId = '')"; #and p.productId not in (select distinct(productId) from EventManagementSystem_prerequisites) order by sequenceNumber"; my $p = WebGUI::Paginator->new($self->session,$self->getUrl,$self->get("paginateAfter"));