BUG UnsavedRelationList aren't checked

When saveInto is called on ListboxField and CheckboxsetField, UnsavedRelationList should be an acceptable relationship type. This is leading to relations not being saved on initial creation of Member objects
silverstripe · Feb 19, 2013 · 4e36020 · 4e36020
1 parent 920fd71
commit 4e36020
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/forms/CheckboxSetField.php b/forms/CheckboxSetField.php
@@ -181,7 +181,7 @@ public function setValue($value, $obj = null) {
 	public function saveInto(DataObjectInterface $record) {
 		$fieldname = $this->name;
 		$relation = ($fieldname && $record && $record->hasMethod($fieldname)) ? $record->$fieldname() : null;
-		if($fieldname && $record && $relation && $relation instanceof RelationList) {
+		if($fieldname && $record && $relation && ($relation instanceof RelationList || $relation instanceof UnsavedRelationList)) {
 			$idList = array();
 			if($this->value) foreach($this->value as $id => $bool) {
 				if($bool) {

diff --git a/forms/ListboxField.php b/forms/ListboxField.php
@@ -179,7 +179,7 @@ public function saveInto(DataObjectInterface $record) {
 		if($this->multiple) {
 			$fieldname = $this->name;
 			$relation = ($fieldname && $record && $record->hasMethod($fieldname)) ? $record->$fieldname() : null;
-			if($fieldname && $record && $relation && $relation instanceof RelationList) {
+			if($fieldname && $record && $relation && ($relation instanceof RelationList || $relation instanceof UnsavedRelationList)) {
 				$idList = (is_array($this->value)) ? array_values($this->value) : array();
 				if(!$record->ID) {
 					$record->write(); // record needs to have an ID in order to set relationships