tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-05 07:38:26 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Marking has_many() and many_many() fields as Translatable fields

Browse Source 
BUGFIX Excluding Access fields on SiteTree from Translatable->updateCMSFields(), as their original values break the javascript logic for showing/hiding the fields

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79269 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-06-15 23:29:53 +00:00
parent 46a7113895
commit a145ebf8d2
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/model/Translatable.php
View File

@ -429,7 +429,11 @@ class Translatable extends DataObjectDecorator {
// setting translatable fields by inspecting owner - this should really be done in the constructor // setting translatable fields by inspecting owner - this should really be done in the constructor
if($this->owner && $this->translatableFields === null) { if($this->owner && $this->translatableFields === null) {
$this->translatableFields = array_keys($this->owner->inheritedDatabaseFields()); $this->translatableFields = array_merge(
array_keys($this->owner->inheritedDatabaseFields()),
array_keys($this->owner->has_many()),
array_keys($this->owner->many_many())
);
} }
} }
@ -792,6 +796,13 @@ class Translatable extends DataObjectDecorator {
// Don't apply these modifications for normal DataObjects - they rely on CMSMain logic // Don't apply these modifications for normal DataObjects - they rely on CMSMain logic
if(!($this->owner instanceof SiteTree)) return; if(!($this->owner instanceof SiteTree)) return;
$excludeFields = array(
'ViewerGroups',
'EditorGroups',
'CanViewType',
'CanEditType'
);
// used in CMSMain->init() to set language state when reading/writing record // used in CMSMain->init() to set language state when reading/writing record
$fields->push(new HiddenField("Locale", "Locale", $this->owner->Locale) ); $fields->push(new HiddenField("Locale", "Locale", $this->owner->Locale) );
@ -834,6 +845,8 @@ class Translatable extends DataObjectDecorator {
// (fields are object references, so we can replace them with the translatable CompositeField) // (fields are object references, so we can replace them with the translatable CompositeField)
foreach($allDataFields as $dataField) { foreach($allDataFields as $dataField) {
if($dataField instanceof HiddenField) continue; if($dataField instanceof HiddenField) continue;
if(in_array($dataField->Name(), $excludeFields)) continue;
if(in_array($dataField->Name(), $translatableFieldNames)) { if(in_array($dataField->Name(), $translatableFieldNames)) {
// if the field is translatable, perform transformation // if the field is translatable, perform transformation
$fields->replaceField($dataField->Name(), $transformation->transformFormField($dataField)); $fields->replaceField($dataField->Name(), $transformation->transformFormField($dataField));