oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some bug fixing

Browse source
This commit is contained in:
JT Smith 2008-05-17 17:23:24 +00:00
parent 086df4ef71
commit b0ec9edf53
4 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
docs/upgrades/upgrade_7.5.10-7.5.11.pl
View file

@ -456,6 +456,15 @@ sub upgradeEMS {
}
}
}
$db->write("drop table EventManagementSystem_badges");
$db->write("drop table EventManagementSystem_discountPasses");
$db->write("drop table EventManagementSystem_metaData");
$db->write("drop table EventManagementSystem_prerequisiteEvents");
$db->write("drop table EventManagementSystem_prerequisites");
$db->write("drop table EventManagementSystem_products");
$db->write("drop table EventManagementSystem_purchases");
$db->write("drop table EventManagementSystem_registrations");
$db->write("drop table EventManagementSystem_sessionPurchaseRef");
}
#-------------------------------------------------
@ -565,6 +574,8 @@ sub convertTransactionLog {
}, $oldItem->{itemId});
}
}
$db->write("drop table oldtransaction");
$db->write("drop table oldtransactionitem");
}
#-------------------------------------------------

17
lib/WebGUI/Asset/Wobject/Shelf.pm
View file

@ -82,19 +82,26 @@ sub view {
my $session = $self->session;
# get other shelves
my @children = ();
my @childShelves = ();
foreach my $child (@{$self->getLineage(['children'],{returnObjects=>1,includeOnlyClasses=>['WebGUI::Asset::Wobject::Shelf']})}) {
my $properties = $child->get;
$child->{url} = $self->getUrl;
push @children, $child;
push @childShelves, $child;
}
# get other child skus
my @childSkus = ();
foreach my $child (@{$self->getLineage(['children'],{includeOnlyClasses=>['WebGUI::Asset::Wobject::Shelf']})}) {
my $properties = $child->get;
$child->{url} = $self->getUrl;
push @childSkus, $child;
}
# find products based upon keywords
my @keywords = $self->get('keywords');
my $p = WebGUI::Keyword->new($session)->getMatchingAssets({
my $keywordBasedAsssetIds = WebGUI::Keyword->new($session)->getMatchingAssets({
matchAssetKeywords => $self,
isa => 'WebGUI::Asset::Sku',
usePaginator => 1,
});
$p->setBaseUrl($self->getUrl('func=view'));
@ -115,7 +122,7 @@ sub view {
}
}
my %var = (
shelves => \@children,
shelves => \@childShelves,
products => \@skus,
);
$p->appendTemplateVars(\%var);

1
lib/WebGUI/Keyword.pm
View file

@ -234,6 +234,7 @@ sub getMatchingAssets {
push @placeholders, '?';
push @params, $word;
}
next unless scalar @placeholders;
push @clauses, 'keyword in ('.join(',', @placeholders).')';
}

2
lib/WebGUI/Paginator.pm
View file

@ -709,7 +709,7 @@ sub setDataByQuery {
($self->{_totalRows}) = $dbh->quickArray("select found_rows()");
$self->{_columnNames} = [ $sth->getColumnNames ];
my @row;
my @row = ();
while (my $data = $sth->hashRef) {
push(@row,$data);
}