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

More bug fixes

Browse source
This commit is contained in:
Roy Johnson 2006-04-23 19:32:15 +00:00
parent 0c94aee3c5
commit 7b57165265
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl
View file

@ -15,7 +15,6 @@
<li><a href='<tmpl_var manageEvents.url>'><tmpl_var manageEvents.label></a></li>
</tmpl_if>
<li><a href='<tmpl_var managePurchases.url>'><tmpl_var managePurchases.label></a></li>
<li><a href="<tmpl_var checkout.url>"><tmpl_var checkout.label></a></li>
</ul>
<tmpl_var calendarJS>
<tmpl_unless noSearchDialog>
@ -244,4 +243,4 @@ tr.evenRow td {
</style>
<link href="^Extras;/calendar/calendar-win2k-1.css" rel="stylesheet" type="text/css" />
<link href="^Extras;/calendar/calendar-win2k-1.css" rel="stylesheet" type="text/css" />

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

@ -2669,7 +2669,7 @@ sub www_search {
$joins
where
p.productId = e.productId and approved=1
and e.assetId =".$self->session->db->quote($self->get("assetId")).$searchPhrases. "order by sequenceNumber";
and e.assetId =".$self->session->db->quote($self->get("assetId")).$searchPhrases. " order by sequenceNumber";
# ."
# and p.productId not in (select distinct(productId) from EventManagementSystem_prerequisites)";
@ -2781,8 +2781,7 @@ sub www_search {
push (@events, {'event' => $self->processTemplate(\%eventFields, $event->{'templateId'}), %eventFields });
}
$var{'checkout.url'} = $self->getUrl('op=viewCart');
$var{'checkout.label'} = $i18n->get('checkout');
$var{'events_loop'} = \@events;
$var{'paginateBar'} = $p->getBarTraditional;
$var{'manageEvents.url'} = $self->getUrl('func=search');
@ -2842,11 +2841,11 @@ sub www_search {
$message = $i18n->get('forced narrowing');
}
my $somethingInScratch = scalar(@{$self->getEventsInScratchCart});
$var{'message'} = $message;
$var{'numberOfSearchResults'} = $numSearchResults;
$var{'continue.url'} = $self->getUrl('func=addToCart;pid=_noid_');
$var{'continue.label'} = "Continue";
$var{'continue.url'} = $self->getUrl('func=addToCart;pid=_noid_') unless ($managePrereqsFlag || !$somethingInScratch);
$var{'continue.label'} = "Continue" unless ($managePrereqsFlag || !$somethingInScratch);
$var{'name.label'} = "Event";
$var{'starts.label'} = "Starts";
$var{'ends.label'} = "Ends";