some badge drop down changes.
This commit is contained in:
parent
b5444d0d5d
commit
8e5d2f2e4d
1 changed files with 10 additions and 4 deletions
|
|
@ -758,7 +758,7 @@ sub getBadgeSelector {
|
||||||
my $isAdmin = $self->canAddEvents;
|
my $isAdmin = $self->canAddEvents;
|
||||||
|
|
||||||
my $badges = {};
|
my $badges = {};
|
||||||
|
my $me = $self->session->var->get('userId');
|
||||||
my $addBadgeId = $self->session->scratch->get('EMS_add_purchase_badgeId');
|
my $addBadgeId = $self->session->scratch->get('EMS_add_purchase_badgeId');
|
||||||
|
|
||||||
if ($isAdmin) {
|
if ($isAdmin) {
|
||||||
|
|
@ -766,22 +766,28 @@ sub getBadgeSelector {
|
||||||
$badges = $self->session->db->buildHashRef("select badgeId, CONCAT(lastName,', ',firstName) from EventManagementSystem_badges order by lastName");
|
$badges = $self->session->db->buildHashRef("select badgeId, CONCAT(lastName,', ',firstName) from EventManagementSystem_badges order by lastName");
|
||||||
} else {
|
} else {
|
||||||
#badges we have purchased.
|
#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 $js;
|
||||||
my %badgeJS;
|
my %badgeJS;
|
||||||
|
my $defaultBadge;
|
||||||
foreach (keys %$badges) {
|
foreach (keys %$badges) {
|
||||||
$badgeJS{$_} = $self->session->db->quickHashRef("select * from EventManagementSystem_badges where badgeId=?",[$_]);
|
$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 = '<script type="text/javascript">
|
$js = '<script type="text/javascript">
|
||||||
var badges = '.objToJson(\%badgeJS).';
|
var badges = '.objToJson(\%badgeJS).';
|
||||||
</script>';
|
</script>';
|
||||||
|
|
||||||
%options = (%options,%{$badges});
|
%options = (%options,%{$badges});
|
||||||
$output .= WebGUI::Form::selectBox($self->session,{
|
$output .= WebGUI::Form::selectBox($self->session,{
|
||||||
name => ($addBadgeId ? 'badgeIdWrong' : 'badgeId'),
|
name => ($addBadgeId ? 'badgeIdWrong' : 'badgeId'),
|
||||||
options => \%options,
|
options => \%options,
|
||||||
value => $addBadgeId,
|
value => ($addBadgeId ? $addBadgeId : $defaultBadge),
|
||||||
extras => 'onchange="swapBadgeInfo(this.value)" onkeyup="swapBadgeInfo(this.value)"'.($addBadgeId ? ' disabled="disabled"' : '')
|
extras => 'onchange="swapBadgeInfo(this.value)" onkeyup="swapBadgeInfo(this.value)"'.($addBadgeId ? ' disabled="disabled"' : '')
|
||||||
}).($addBadgeId ? WebGUI::Form::hidden($self->session,{
|
}).($addBadgeId ? WebGUI::Form::hidden($self->session,{
|
||||||
name => 'badgeId',value=>$addBadgeId
|
name => 'badgeId',value=>$addBadgeId
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue