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

Forward porting date fix for gallery advanced search.

Browse source
This commit is contained in:
Colin Kuskie 2009-04-26 23:29:52 +00:00
parent 2470aeb750
commit 5c364112d8
2 changed files with 8 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

@ -5,6 +5,7 @@
- fixed #10210: Generated Message-Id invalid (patch basis from tektek)
- fixed #10209: Changing existing user profile field type doesn't change underlying database column type
- fixed #10047: SQLReport Debug doesn't catch when bind variables are incorrect
- fixed #10260: WebGUI::Asset::Wobject::Gallery.pm default search date misfunction
7.7.4
- rfe: Extend DateTime for Week-Nrs (#9151)

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

@ -437,7 +437,7 @@ sub appendTemplateVarsSearchForm {
$var->{ searchForm_creationDate_after }
= WebGUI::Form::dateTime( $session, {
name => "creationDate_after",
value => $form->get("creationDate_after","dateTime") || $oneYearAgo,
value => $form->get("creationDate_after") || $oneYearAgo,
});
$var->{ searchForm_creationDate_before }
= WebGUI::Form::dateTime( $session, {
@ -1369,8 +1369,9 @@ search and display the results if necessary.
sub www_search {
my $self = shift;
my $form = $self->session->form;
my $db = $self->session->db;
my $session = $self->session;
my $form = $session->form;
my $db = $session->db;
my $var = $self->getTemplateVars;
# NOTE: Search form is added as part of getTemplateVars()
@ -1413,7 +1414,8 @@ sub www_search {
;
}
my $dateAfter = $form->get("creationDate_after", "dateTime");
my $oneYearAgo = WebGUI::DateTime->new( $session, time )->add( years => -1 )->epoch;
my $dateAfter = $form->get("creationDate_after") || $oneYearAgo;
my $dateBefore = $form->get("creationDate_before", "dateTime");
my $creationDate = {};
if ($dateAfter) {
@ -1463,7 +1465,7 @@ sub www_search {
$p->appendTemplateVars( $var );
for my $result ( @{ $p->getPageData } ) {
my $asset = WebGUI::Asset->newByDynamicClass( $self->session, $result->{assetId} );
my $asset = WebGUI::Asset->newByDynamicClass( $session, $result->{assetId} );
push @{ $var->{search_results} }, {
%{ $asset->getTemplateVars },
isAlbum => $asset->isa( 'WebGUI::Asset::Wobject::GalleryAlbum' ),