From 21183eb10ccf667445b91897fe5f14628bd6f1ab Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Fri, 29 Jan 2010 17:06:04 -0600 Subject: [PATCH] fix #11292: Asset Manager search too sticky --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Content/AssetManager.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 726a48e91..4ed689bfa 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -10,6 +10,7 @@ - fixed #11380: "Use this Address" button in Shop needs to be green! - fixed: Due to a typo France was not considered part of the EU by the EU TaxDriver. ( Martin Kamerbeek / Oqapi ) + - fixed #11292: Made search less sticky 7.8.10 - fixed #11332: Pagination in webgui.org forum urls diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm index 3eea68663..c23d46149 100644 --- a/lib/WebGUI/Content/AssetManager.pm +++ b/lib/WebGUI/Content/AssetManager.pm @@ -27,7 +27,7 @@ sub getClassSelectBox { ); delete $classes{"WebGUI::Asset"}; # don't want to search for the root asset - my $className = $session->scratch->get('assetManagerSearchClassName') || $session->form->process("class","className"); + my $className = $session->form->process("class","className") || $session->scratch->get('assetManagerSearchClassName'); $session->scratch->set('assetManagerSearchClassName', $className); return WebGUI::Form::selectBox( $session, { name => "class",