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

Dates in the galley advanced search were ignored.

Browse source
This commit is contained in:
Colin Kuskie 2009-02-04 16:58:25 +00:00
parent a5ad3bf4bd
commit 62a14a2dcc
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,7 @@
- fixed #9623: preload.custom paths not included during upgrade - fixed #9623: preload.custom paths not included during upgrade
- fixed #9638: Survey - Submit of survey creates new demo - fixed #9638: Survey - Submit of survey creates new demo
- fixed #9669: Folder: synopsis var of a subfolder broken - fixed #9669: Folder: synopsis var of a subfolder broken
- fixed #9658: gallery advanced search dates do not work
7.6.10 7.6.10
- fixed #9577: WebGUI::Form::Url::getValue returns blank rather than undef for blank fields - fixed #9577: WebGUI::Form::Url::getValue returns blank rather than undef for blank fields

23
lib/WebGUI/Asset/Wobject/Gallery.pm
View file

@ -1349,11 +1349,13 @@ sub www_search {
if ( $doSearch ) { if ( $doSearch ) {
# Keywords to search on # Keywords to search on
my $keywords = join " ", $form->get('basicSearch'), # Do not add a space to the
$form->get('keywords'), my $keywords;
$form->get('title'), FORMVAR: foreach my $formVar (qw/ basicSearch keywords title description /) {
$form->get('description') my $var = $form->get($formVar);
; next FORMVAR unless $var;
$keywords = join ' ', $keywords, $var;
}
# Build a where clause from the advanced options # Build a where clause from the advanced options
# Lineage search can capture gallery # Lineage search can capture gallery
@ -1374,6 +1376,16 @@ sub www_search {
; ;
} }
my $dateAfter = $form->get("creationDate_after", "dateTime");
my $dateBefore = $form->get("creationDate_before", "dateTime");
my $creationDate = {};
if ($dateAfter) {
$creationDate->{start} = $dateAfter;
}
if ($dateBefore) {
$creationDate->{end } = $dateBefore;
}
# Classes # Classes
my $joinClass = [ my $joinClass = [
'WebGUI::Asset::Wobject::GalleryAlbum', 'WebGUI::Asset::Wobject::GalleryAlbum',
@ -1407,6 +1419,7 @@ sub www_search {
keywords => $keywords, keywords => $keywords,
where => $where, where => $where,
joinClass => $joinClass, joinClass => $joinClass,
creationDate => $creationDate,
} ); } );
$var->{ keywords } = $keywords; $var->{ keywords } = $keywords;