diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index c4e93f318..5b6ba87da 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -8,6 +8,10 @@ - rfe: Added message to user search operation when user count exceeds 250. (Diona Kidd, Knowmad Technologies) + +7.4.16 + - fix: EMS - Adding Prerequisite sets. + 7.4.15 - fix: Image asset test fails - fix: Article attachments don't obey max image dimentions diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index 1023e7c2d..42e49ae9b 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -1922,7 +1922,11 @@ sub www_editEvent { ); my %prereqSets; tie %prereqSets, 'Tie::IxHash'; - %prereqSets = $self->session->db->buildHash("select prerequisiteId, name from EventManagementSystem_prerequisites order by name"); + my $conditionalWhere = ""; + if ($self->get("globalPrerequisites") == 0) { + $conditionalWhere = "where assetId=".$self->session->db->quote($self->getId); + } + %prereqSets = $self->session->db->buildHash("select prerequisiteId, name from EventManagementSystem_prerequisites $conditionalWhere order by name"); my %prereqMemberships = $self->session->db->buildHash("select prerequisiteId, requiredProductId from EventManagementSystem_prerequisiteEvents where requiredProductId=?",[$pid]); if (scalar(keys(%prereqSets)) && (scalar(keys(%prereqMemberships)) == 0)) { #there are some prereq sets entered into the system, and @@ -4330,6 +4334,10 @@ sub www_editPrereqSet { }, -value=>$data->{operator} ); + my $conditionalWhere = ""; + if ($self->get("globalPrerequisites") == 0) { + $conditionalWhere = "and e.assetId=".$self->session->db->quote($self->getId); + } $f->checkList( -name=>"requiredEvents", -vertical=>1, @@ -4339,6 +4347,7 @@ sub www_editPrereqSet { from products as p, EventManagementSystem_products as e where p.productId = e.productId + $conditionalWhere and (e.prerequisiteId is NULL or e.prerequisiteId = '')"), -value=>$self->session->db->buildArrayRef("select requiredProductId from EventManagementSystem_prerequisiteEvents where prerequisiteId=?",[$psid]) );