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 15:59:22 +00:00
parent 6b9272984c
commit 1934132002
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,10 @@
- rfe: Added message to user search operation when user count exceeds 250. - rfe: Added message to user search operation when user count exceeds 250.
(Diona Kidd, Knowmad Technologies) (Diona Kidd, Knowmad Technologies)
7.4.16
- fix: EMS - Adding Prerequisite sets.
7.4.15 7.4.15
- fix: Image asset test fails - fix: Image asset test fails
- fix: Article attachments don't obey max image dimentions - fix: Article attachments don't obey max image dimentions

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

@ -1922,7 +1922,11 @@ sub www_editEvent {
); );
my %prereqSets; my %prereqSets;
tie %prereqSets, 'Tie::IxHash'; 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]); my %prereqMemberships = $self->session->db->buildHash("select prerequisiteId, requiredProductId from EventManagementSystem_prerequisiteEvents where requiredProductId=?",[$pid]);
if (scalar(keys(%prereqSets)) && (scalar(keys(%prereqMemberships)) == 0)) { if (scalar(keys(%prereqSets)) && (scalar(keys(%prereqMemberships)) == 0)) {
#there are some prereq sets entered into the system, and #there are some prereq sets entered into the system, and
@ -4330,6 +4334,10 @@ sub www_editPrereqSet {
}, },
-value=>$data->{operator} -value=>$data->{operator}
); );
my $conditionalWhere = "";
if ($self->get("globalPrerequisites") == 0) {
$conditionalWhere = "and e.assetId=".$self->session->db->quote($self->getId);
}
$f->checkList( $f->checkList(
-name=>"requiredEvents", -name=>"requiredEvents",
-vertical=>1, -vertical=>1,
@ -4339,6 +4347,7 @@ sub www_editPrereqSet {
from products as p, EventManagementSystem_products as e from products as p, EventManagementSystem_products as e
where where
p.productId = e.productId p.productId = e.productId
$conditionalWhere
and (e.prerequisiteId is NULL or e.prerequisiteId = '')"), and (e.prerequisiteId is NULL or e.prerequisiteId = '')"),
-value=>$self->session->db->buildArrayRef("select requiredProductId from EventManagementSystem_prerequisiteEvents where prerequisiteId=?",[$psid]) -value=>$self->session->db->buildArrayRef("select requiredProductId from EventManagementSystem_prerequisiteEvents where prerequisiteId=?",[$psid])
); );