TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #961 from tresbach/develop 

Allow setting 'options' for a scope in filter config
This commit is contained in:
Samuel Georges 2015-02-25 19:07:49 +11:00
parent 2bdc5aea78 d50e9e743f
commit a748eb1b23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/classes/FilterScope.php
View File

@ -114,7 +114,7 @@ class FilterScope
protected function evalConfig($config)
{
if (isset($config['options'])) {
$this->options($config['options']);
$this->options = $config['options'];
}
if (isset($config['context'])) {
$this->context = $config['context'];

6
modules/backend/widgets/Filter.php
View File

@ -170,6 +170,10 @@ class Filter extends WidgetBase
*/
protected function getAvailableOptions($scope, $searchQuery = null)
{
if (count($scope->options)) {
return $scope->options;
}
$available = [];
$nameColumn = $this->getScopeNameColumn($scope);
$options = $this->getOptionsFromModel($scope, $searchQuery);
@ -210,7 +214,7 @@ class Filter extends WidgetBase
$query = $model->newQuery();
$this->fireEvent('filter.extendQuery', [$query, $scope]);
if (!$searchQuery) {
return $query->get();
}