tonyair/silverstripe-translatable
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-translatable synced 2024-10-22 11:05:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #278 from creative-commoners/pulls/2.2/fix-invalid-stage

Browse Source 
BUG Fix invalid stage being specified for queried records
This commit is contained in:
Robbie Averill 2018-06-12 09:16:07 +12:00 committed by GitHub
commit b8d794a5c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/model/Translatable.php
View File

@ -1295,20 +1295,16 @@ class Translatable extends DataExtension implements PermissionProvider {
// exclude the language of the current owner // exclude the language of the current owner
$filter .= sprintf(' AND "%s"."Locale" != \'%s\'', $baseDataClass, $this->owner->Locale); $filter .= sprintf(' AND "%s"."Locale" != \'%s\'', $baseDataClass, $this->owner->Locale);
} }
$currentStage = Versioned::current_stage();
$joinOnClause = sprintf('"%s_translationgroups"."OriginalID" = "%s"."ID"', $baseDataClass, $baseDataClass); $joinOnClause = sprintf('"%s_translationgroups"."OriginalID" = "%s"."ID"', $baseDataClass, $baseDataClass);
if($this->owner->hasExtension("Versioned")) { if($this->owner->hasExtension("Versioned") && $stage) {
if($stage) Versioned::reading_stage($stage);
$translations = Versioned::get_by_stage( $translations = Versioned::get_by_stage(
$baseDataClass, $baseDataClass,
Versioned::current_stage(), $stage,
$filter, $filter,
null null
)->leftJoin("{$baseDataClass}_translationgroups", $joinOnClause); )->leftJoin("{$baseDataClass}_translationgroups", $joinOnClause);
if($stage) Versioned::reading_stage($currentStage);
} else { } else {
$class = $this->owner->class; $translations = DataObject::get($baseDataClass)
$translations = $baseDataClass::get()
->where($filter) ->where($filter)
->leftJoin("{$baseDataClass}_translationgroups", $joinOnClause); ->leftJoin("{$baseDataClass}_translationgroups", $joinOnClause);
} }