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

Allow query to be completely swapped out using extendQuery 

Add HTML array support to valueFrom (without relations)
This commit is contained in:
Samuel Georges 2015-02-28 22:07:06 +11:00
parent f2277b61dc
commit 81d0225928
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/backend/widgets/Lists.php
View File

@ -2,6 +2,7 @@
use Db;
use HTML as Html;
use Str;
use App;
use Lang;
use Input;
@ -462,8 +463,12 @@ class Lists extends WidgetBase
/*
* Extensibility
*/
Event::fire('backend.list.extendQuery', [$this, $query]);
$this->fireEvent('list.extendQuery', [$query]);
if (
($event = $this->fireEvent('list.extendQuery', [$query], true)) ||
($event = Event::fire('backend.list.extendQuery', [$this, $query], true))
) {
return $event;
}
return $query;
}
@ -731,7 +736,11 @@ class Lists extends WidgetBase
* Handle taking value from model attribute.
*/
elseif ($column->valueFrom) {
$value = $record->{$column->valueFrom};
$keyParts = Str::evalHtmlArray($column->valueFrom);
$value = $record;
foreach ($keyParts as $key) {
$value = $value->{$key};
}
}
/*
* Otherwise, if the column is a relation, it will be a custom select,