diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php index 8b40c3ed3..3017dd78a 100644 --- a/modules/backend/formwidgets/RecordFinder.php +++ b/modules/backend/formwidgets/RecordFinder.php @@ -130,6 +130,8 @@ class RecordFinder extends FormWidgetBase $this->searchWidget = $this->makeSearchWidget(); $this->searchWidget->bindToController(); + $this->listWidget->setSearchTerm($this->searchWidget->getActiveTerm()); + /* * Link the Search Widget to the List Widget */ @@ -137,8 +139,6 @@ class RecordFinder extends FormWidgetBase $this->listWidget->setSearchTerm($this->searchWidget->getActiveTerm()); return $this->listWidget->onRefresh(); }); - - $this->searchWidget->setActiveTerm(null); } } @@ -237,6 +237,15 @@ class RecordFinder extends FormWidgetBase public function onFindRecord() { $this->prepareVars(); + + /* + * Purge the search term stored in session + */ + if ($this->searchWidget) { + $this->listWidget->setSearchTerm(null); + $this->searchWidget->setActiveTerm(null); + } + return $this->makePartial('recordfinder_form'); }