tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUG cache the cacheKey in TreeDropdownField, so it doesn't need to query for it multiple times in the same request

Browse Source
This commit is contained in:
Christopher Joe 2017-10-16 15:10:05 +13:00 committed by Damian Mooyman
parent 3e9dc5c7d2
commit 076d7d78c6
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Forms/TreeDropdownField.php
View File

@ -8,6 +8,7 @@ use SilverStripe\Control\HTTPResponse;
use SilverStripe\Core\Convert; use SilverStripe\Core\Convert;
use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\Hierarchy\Hierarchy; use SilverStripe\ORM\Hierarchy\Hierarchy;
use SilverStripe\ORM\Hierarchy\MarkedSet; use SilverStripe\ORM\Hierarchy\MarkedSet;
use SilverStripe\View\ViewableData; use SilverStripe\View\ViewableData;
@ -202,6 +203,11 @@ class TreeDropdownField extends FormField
*/ */
protected $showSelectedPath = false; protected $showSelectedPath = false;
/**
* @var array
*/
protected static $cacheKeyCache = [];
/** /**
* CAVEAT: for search to work properly $labelField must be a database field, * CAVEAT: for search to work properly $labelField must be a database field,
* or you need to setSearchFunction. * or you need to setSearchFunction.
@ -858,8 +864,7 @@ class TreeDropdownField extends FormField
/** @var Hierarchy|DataObject $record */ /** @var Hierarchy|DataObject $record */
$record = $this->Value() ? $this->objectForKey($this->Value()) : null; $record = $this->Value() ? $this->objectForKey($this->Value()) : null;
// Ensure cache is keyed by last modified date of the underlying list $data['data']['cacheKey'] = $this->getCacheKey();
$data['data']['cacheKey'] = DataList::create($this->getSourceObject())->max('LastEdited');
$data['data']['showSelectedPath'] = $this->getShowSelectedPath(); $data['data']['showSelectedPath'] = $this->getShowSelectedPath();
if ($record) { if ($record) {
$titlePath = ''; $titlePath = '';
@ -883,6 +888,21 @@ class TreeDropdownField extends FormField
return $data; return $data;
} }
/**
* Ensure cache is keyed by last modified datetime of the underlying list.
* Caches the key for the respective underlying list types, since it doesn't need to query again.
*
* @return DBDatetime
*/
protected function getCacheKey()
{
$target = $this->getSourceObject();
if (!isset(self::$cacheKeyCache[$target])) {
self::$cacheKeyCache[$target] = DataList::create($target)->max('LastEdited');
}
return self::$cacheKeyCache[$target];
}
public function getSchemaDataDefaults() public function getSchemaDataDefaults()
{ {
$data = parent::getSchemaDataDefaults(); $data = parent::getSchemaDataDefaults();