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

MINOR Caching DataObject->fieldLabels() in memory, to avoid _t() being called excessively through fieldLabel()

Browse Source
This commit is contained in:
Ingo Schommer 2012-04-13 18:38:23 +02:00
parent 3002598a5e
commit b81863cfd9
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
model/DataObject.php
View File

@ -148,6 +148,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
protected static $_cache_get_one; protected static $_cache_get_one;
protected static $_cache_get_class_ancestry; protected static $_cache_get_class_ancestry;
protected static $_cache_composite_fields = array(); protected static $_cache_composite_fields = array();
protected static $_cache_field_labels = array();
/** /**
* Non-static relationship cache, indexed by component name. * Non-static relationship cache, indexed by component name.
@ -2672,6 +2673,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
DataObject::$_cache_get_one = array(); DataObject::$_cache_get_one = array();
DataObject::$_cache_composite_fields = array(); DataObject::$_cache_composite_fields = array();
DataObject::$_cache_get_class_ancestry = array(); DataObject::$_cache_get_class_ancestry = array();
DataObject::$_cache_field_labels = array();
} }
/** /**
@ -2953,33 +2955,39 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return array|string Array of all element labels if no argument given, otherwise the label of the field * @return array|string Array of all element labels if no argument given, otherwise the label of the field
*/ */
public function fieldLabels($includerelations = true) { public function fieldLabels($includerelations = true) {
$customLabels = $this->stat('field_labels'); $cacheKey = $this->class . '_' . $includerelations;
$autoLabels = array();
// get all translated static properties as defined in i18nCollectStatics() if(!isset(self::$_cache_field_labels[$cacheKey])) {
$ancestry = ClassInfo::ancestry($this->class); $customLabels = $this->stat('field_labels');
$ancestry = array_reverse($ancestry); $autoLabels = array();
if($ancestry) foreach($ancestry as $ancestorClass) {
if($ancestorClass == 'ViewableData') break; // get all translated static properties as defined in i18nCollectStatics()
$types = array( $ancestry = ClassInfo::ancestry($this->class);
'db' => (array)Config::inst()->get($ancestorClass, 'db', Config::UNINHERITED) $ancestry = array_reverse($ancestry);
); if($ancestry) foreach($ancestry as $ancestorClass) {
if($includerelations){ if($ancestorClass == 'ViewableData') break;
$types['has_one'] = (array)singleton($ancestorClass)->uninherited('has_one', true); $types = array(
$types['has_many'] = (array)singleton($ancestorClass)->uninherited('has_many', true); 'db' => (array)Config::inst()->get($ancestorClass, 'db', Config::UNINHERITED)
$types['many_many'] = (array)singleton($ancestorClass)->uninherited('many_many', true); );
} if($includerelations){
foreach($types as $type => $attrs) { $types['has_one'] = (array)singleton($ancestorClass)->uninherited('has_one', true);
foreach($attrs as $name => $spec) $types['has_many'] = (array)singleton($ancestorClass)->uninherited('has_many', true);
$autoLabels[$name] = _t("{$ancestorClass}.{$type}_{$name}",FormField::name_to_label($name)); $types['many_many'] = (array)singleton($ancestorClass)->uninherited('many_many', true);
} }
} foreach($types as $type => $attrs) {
foreach($attrs as $name => $spec) {
// var_dump("{$ancestorClass}.{$type}_{$name}");
$autoLabels[$name] = _t("{$ancestorClass}.{$type}_{$name}",FormField::name_to_label($name));
}
}
}
$labels = array_merge((array)$autoLabels, (array)$customLabels); $labels = array_merge((array)$autoLabels, (array)$customLabels);
$this->extend('updateFieldLabels', $labels);
self::$_cache_field_labels[$cacheKey] = $labels;
}
$this->extend('updateFieldLabels', $labels); return self::$_cache_field_labels[$cacheKey];
return $labels;
} }
/** /**