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

FIXED: Issue where $enable_siteconfig_generation flag was not being set correctly, causing failed test cases_

Browse Source 
FIXED: Duplicate entries in test database
This commit is contained in:
Damian Mooyman 2012-08-16 16:29:27 +12:00
parent 8e851e3f82
commit 3688af2e7a
2 changed files with 21 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
code/model/Translatable.php
View File

@ -1132,13 +1132,6 @@ class Translatable extends DataExtension implements PermissionProvider {
return ($translations) ? $translations->First() : null; return ($translations) ? $translations->First() : null;
} }
/**
* Enables automatic population of SiteConfig fields using createTranslation if
* created outside of the Translatable module
* @var boolean
*/
public static $enable_siteconfig_generation = true;
/** /**
* When the SiteConfig object is automatically instantiated, we should ensure that * When the SiteConfig object is automatically instantiated, we should ensure that
* 1. All SiteConfig objects belong to the same group * 1. All SiteConfig objects belong to the same group
@ -1150,12 +1143,14 @@ class Translatable extends DataExtension implements PermissionProvider {
* @see SiteConfig * @see SiteConfig
*/ */
protected function populateSiteConfig() { protected function populateSiteConfig() {
// This is required to prevent infinite loop during createTranslation
// If createTranslation is called directly on SiteConfig then this function could // Work-around for population of defaults during test setup (when tables are not created).
// be called twice, but it will not cause harm for this to happen. // When the database is being setup during testing, singleton('SiteConfig') is called.
if(!self::$enable_siteconfig_generation) // Singleton objects should not call populateDefault() but a bug seems to be allowing it
// to happen anyway. Looking up existing SiteConfig objects without a database crashes horribly
// @todo Remove this hack once this bug is fixed
if(SapphireTest::using_temp_db() && !DB::getConn()->hasTable($this->owner->class))
return; return;
self::$enable_siteconfig_generation = false;
// Find the best base translation for site config // Find the best base translation for site config
Translatable::disable_locale_filter(); Translatable::disable_locale_filter();
@ -1181,19 +1176,28 @@ class Translatable extends DataExtension implements PermissionProvider {
// Copy fields from translated object (including ID) to the generated object // Copy fields from translated object (including ID) to the generated object
// This is similar to the creation of objects via createTranslation, but we need to // This is similar to the creation of objects via createTranslation, but we need to
// preserve the ID in order to prevent // preserve the ID in order to prevent unnecessary object creation
$this->owner->update($stagingConfig->toMap()); $this->owner->update($stagingConfig->toMap());
// Re-enable config generation
self::$enable_siteconfig_generation = true;
} }
/**
* Enables automatic population of SiteConfig fields using createTranslation if
* created outside of the Translatable module
* @var boolean
*/
public static $enable_siteconfig_generation = true;
/** /**
* Hooks into the DataObject::populateDefaults() method * Hooks into the DataObject::populateDefaults() method
*/ */
public function populateDefaults() { public function populateDefaults() {
if (empty($this->owner->ID) && $this->owner instanceof SiteConfig) if (empty($this->owner->ID) && ($this->owner instanceof SiteConfig) && self::$enable_siteconfig_generation)
{
// Use enable_siteconfig_generation to prevent infinite loop during
self::$enable_siteconfig_generation = false;
$this->populateSiteConfig(); $this->populateSiteConfig();
self::$enable_siteconfig_generation = true;
}
} }
/** /**

43
tests/unit/TranslatableSiteConfigTest.yml
View File

@ -41,46 +41,3 @@ SiteConfig:
Locale: de_DE Locale: de_DE
CanEditType: OnlyTheseUsers CanEditType: OnlyTheseUsers
EditorGroups: =>Group.translators_de EditorGroups: =>Group.translators_de
Permission:
cmsmain1:
Code: CMS_ACCESS_CMSMain
cmsmain2:
Code: CMS_ACCESS_CMSMain
translate_all1:
Code: TRANSLATE_ALL
translate_all2:
Code: TRANSLATE_ALL
Group:
translators_de:
Code: translators_de
Permissions: =>Permission.cmsmain1,=>Permission.translate_all1
translators_en:
Code: translators_en
Permissions: =>Permission.cmsmain2,=>Permission.translate_all2
Member:
translator_de:
Email: translator_de@test.com
Password: test
Groups: =>Group.translators_de
translator_en:
Email: translator_en@test.com
Password: test
Groups: =>Group.translators_en
websiteuser:
Email: websiteuser@test.com
Password: test
Page:
root_en:
URLSegment: root-en
Locale: en_US
SiteConfig:
en_US:
Title: My test site
Locale: en_US
CanEditType: OnlyTheseUsers
EditorGroups: =>Group.translators_en
de_DE:
Title: Meine Test Seite
Locale: de_DE
CanEditType: OnlyTheseUsers
EditorGroups: =>Group.translators_de