Search should persist across pagination

The search term is now reset only when the record finder is first opened
Fixes #2161
This commit is contained in:
Samuel Georges 2016-07-30 11:46:36 +10:00
parent fdcfe801a7
commit 0573e0593a

View File

@ -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');
}