tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-26 14:39:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR GridField compat with ViewableData records (fixes #7479)

Browse Source 
Only use relField() when it exists (usually on DataObject),
otherwise fall back to method or value returns
(same as original GridFieldDataColumns behaviour).
This commit is contained in:
Ingo Schommer 2012-06-15 13:33:34 +02:00
parent 88582e7483
commit 02332da7fb
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forms/gridfield/GridField.php
View File

@ -438,7 +438,13 @@ class GridField extends FormField {
}
// Default implementation
return $record->relField($fieldName);
if($record->hasMethod('relField')) {
return $record->relField($fieldName);
} elseif($record->hasMethod($fieldName)) {
return $record->$fieldName();
} else {
return $record->$fieldName;
}
}
/**