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

Made Asset Manager search too sticky.

Browse source
This commit is contained in:
Colin Kuskie 2009-12-06 14:57:08 -08:00
parent 9476878b5e
commit 5a25a44221
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
7.8.8 7.8.8
- fixed #11289: Gallery with pending version tag causes search engine indexer to puke. - fixed #11289: Gallery with pending version tag causes search engine indexer to puke.
- fixed #11292: Search function limited to onje search?
7.8.7 7.8.7
- fixed #11278: Wrong test for Template::Toolkit in testEnvironment.pl - fixed #11278: Wrong test for Template::Toolkit in testEnvironment.pl

4
lib/WebGUI/Content/AssetManager.pm
View file

@ -145,7 +145,7 @@ sub getSearchPaginator {
$queryString .= ';class=' . $class; $queryString .= ';class=' . $class;
} }
my $pageNumber = $session->scratch->get('assetManagerSearchPageNumber') || $session->form->get('pn'); my $pageNumber = $session->form->get('pn') || $session->scratch->get('assetManagerSearchPageNumber');
my $p = $s->getPaginatorResultSet( $session->url->page( $queryString ), undef, $pageNumber ); my $p = $s->getPaginatorResultSet( $session->url->page( $queryString ), undef, $pageNumber );
$session->scratch->set('assetManagerSearchPageNumber', $pageNumber); $session->scratch->set('assetManagerSearchPageNumber', $pageNumber);
@ -538,7 +538,7 @@ sub www_search {
$session->style->setScript( $session->url->extras( 'yui/build/yahoo-dom-event/yahoo-dom-event.js' ) ); $session->style->setScript( $session->url->extras( 'yui/build/yahoo-dom-event/yahoo-dom-event.js' ) );
$session->style->setScript( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.js' ) ); $session->style->setScript( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.js' ) );
$session->style->setScript( $session->url->extras( 'yui-webgui/build/form/form.js' ) ); $session->style->setScript( $session->url->extras( 'yui-webgui/build/form/form.js' ) );
my $keywords = $session->scratch->get('assetManagerSearchKeywords') || $session->form->get('keywords'); my $keywords = $session->form->get('keywords') || $session->scratch->get('assetManagerSearchKeywords');
### Show the form ### Show the form
$output .= q{<form method="post" enctype="multipart/form-data" action="} . $currentAsset->getUrl . q{"><p>} $output .= q{<form method="post" enctype="multipart/form-data" action="} . $currentAsset->getUrl . q{"><p>}