From 5deae7a8f9138eb55f2bdaa1b42a317c3a9caad5 Mon Sep 17 00:00:00 2001
From: Florian Thoma <florian.thoma@innoweb.com.au>
Date: Fri, 9 May 2014 11:41:01 +1000
Subject: [PATCH] BUGFIX support for dropdowns of has_one relations

---
 code/model/Translatable.php     |  6 ++++--
 tests/unit/TranslatableTest.php | 35 ++++++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/code/model/Translatable.php b/code/model/Translatable.php
index 2c54b22..a7a9551 100755
--- a/code/model/Translatable.php
+++ b/code/model/Translatable.php
@@ -562,9 +562,11 @@ class Translatable extends DataExtension implements PermissionProvider {
 			$this->translatableFields = array_merge(
 				array_keys($this->owner->db()),
 				array_keys($this->owner->has_many()),
-				array_keys($this->owner->many_many()),
-				array_keys($this->owner->has_one())
+				array_keys($this->owner->many_many())
 			);
+			foreach (array_keys($this->owner->has_one()) as $fieldname) {
+				$this->translatableFields[] = $fieldname.'ID';
+			}
 		}
 	}
 
diff --git a/tests/unit/TranslatableTest.php b/tests/unit/TranslatableTest.php
index 1e4964c..1f653c1 100755
--- a/tests/unit/TranslatableTest.php
+++ b/tests/unit/TranslatableTest.php
@@ -457,6 +457,7 @@ class TranslatableTest extends FunctionalTest {
 		
 		// first test with default language
 		$fields = $pageOrigLang->getCMSFields();
+		// title
 		$this->assertInstanceOf(
 			'TextField', 
 			$fields->dataFieldByName('Title'),
@@ -466,15 +467,23 @@ class TranslatableTest extends FunctionalTest {
 			$fields->dataFieldByName('Title_original'),
 			'Translatable doesnt modify fields if called in default language (e.g. "non-translation mode")'
 		);
+		// custom property
 		$this->assertInstanceOf(
 			'TextField', 
 			$fields->dataFieldByName('TranslatableProperty'),
 			'Has custom field'
 		);
+		// custom has_one
+		$this->assertInstanceOf(
+			'DropdownField', 
+			$fields->dataFieldByName('TranslatableObjectID'),
+			'Has custom dropdown field'
+		);
 		
 		// then in "translation mode"
 		$pageTranslated = $pageOrigLang->createTranslation('fr_FR');
 		$fields = $pageTranslated->getCMSFields();
+		// title
 		$this->assertInstanceOf(
 			'TextField', 
 			$fields->dataFieldByName('Title'),
@@ -486,15 +495,27 @@ class TranslatableTest extends FunctionalTest {
 			$fields->dataFieldByName('Title_original'),
 			'Translatable adds the original value as a ReadonlyField in "translation mode"'
 		);
+		// custom property
 		$this->assertInstanceOf(
 			'ReadonlyField', 
 			$fields->dataFieldByName('TranslatableProperty_original'),
-			'Retains original custom field'
+			'Adds original value for custom field as ReadonlyField'
 		);
 		$this->assertInstanceOf(
 			'TextField', 
 			$fields->dataFieldByName('TranslatableProperty'),
-			'Adds custom fields as ReadonlyField'
+			'Retains custom field as TextField'
+		);
+		// custom has_one
+		$this->assertInstanceOf(
+			'LookupField', 
+			$fields->dataFieldByName('TranslatableObjectID_original'),
+			'Adds original value for custom dropdown field as LookupField (= readonly version of DropdownField)'
+		);
+		$this->assertInstanceOf(
+			'DropdownField', 
+			$fields->dataFieldByName('TranslatableObjectID'),
+			'Retains custom dropdown field as DropdownField'
 		);
 		
 	}
@@ -1215,13 +1236,21 @@ class TranslatableTest_Page extends Page implements TestOnly {
 		'TranslatableProperty' => 'Text'
 	);
 
+	private static $has_one = array(
+		'TranslatableObject' => 'TranslatableTest_DataObject'
+	);
+	
 	function getCMSFields() {
 		$fields = parent::getCMSFields();
 		$fields->addFieldToTab(
 			'Root.Main',
 			new TextField('TranslatableProperty')
 		);
-
+		$fields->addFieldToTab(
+			'Root.Main',
+			new DropdownField('TranslatableObjectID')
+		);
+		
 		$this->applyTranslatableFieldsUpdate($fields, 'updateCMSFields');
 
 		return $fields;