From 8e5d2f2e4d0c0626232fd0f63b9b2106fb9b48f5 Mon Sep 17 00:00:00 2001 From: Matthew Wilson Date: Fri, 21 Apr 2006 00:45:57 +0000 Subject: [PATCH] some badge drop down changes. --- lib/WebGUI/Asset/Wobject/EventManagementSystem.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index a58ae9bef..466bfae68 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -758,7 +758,7 @@ sub getBadgeSelector { my $isAdmin = $self->canAddEvents; my $badges = {}; - + my $me = $self->session->var->get('userId'); my $addBadgeId = $self->session->scratch->get('EMS_add_purchase_badgeId'); if ($isAdmin) { @@ -766,22 +766,28 @@ sub getBadgeSelector { $badges = $self->session->db->buildHashRef("select badgeId, CONCAT(lastName,', ',firstName) from EventManagementSystem_badges order by lastName"); } else { #badges we have purchased. - $badges = $self->session->db->buildHashRef("select b.badgeId, CONCAT(b.lastName,', ',b.firstName) from EventManagementSystem_badges as b where b.userId='".$self->session->var->get('userId')."' or b.createdByUserId='".$self->session->var->get('userId')."' order by b.lastName"); + $badges = $self->session->db->buildHashRef("select b.badgeId, CONCAT(b.lastName,', ',b.firstName) from EventManagementSystem_badges as b where b.userId='".$me."' or b.createdByUserId='".$me."' order by b.lastName"); } my $js; my %badgeJS; + my $defaultBadge; foreach (keys %$badges) { $badgeJS{$_} = $self->session->db->quickHashRef("select * from EventManagementSystem_badges where badgeId=?",[$_]); + $defaultBadge ||= $badgeJS{$_}->{badgeId}; + if ($badgeJS{$_}->{userId} eq $me) { + # we have a match! + delete $options{'thisIsI'}; + $defaultBadge = $badgeJS{$_}->{badgeId}; + } } $js = ''; - %options = (%options,%{$badges}); $output .= WebGUI::Form::selectBox($self->session,{ name => ($addBadgeId ? 'badgeIdWrong' : 'badgeId'), options => \%options, - value => $addBadgeId, + value => ($addBadgeId ? $addBadgeId : $defaultBadge), extras => 'onchange="swapBadgeInfo(this.value)" onkeyup="swapBadgeInfo(this.value)"'.($addBadgeId ? ' disabled="disabled"' : '') }).($addBadgeId ? WebGUI::Form::hidden($self->session,{ name => 'badgeId',value=>$addBadgeId