From 1bf826d34e6a677219a6dae76ebe8d090c64fbc3 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 18 Sep 2015 11:07:58 +1200
Subject: [PATCH] BUG Fix displayrule versioning

---
 code/model/UserDefinedForm.php                |  5 ++++
 .../editableformfields/EditableFormField.php  | 13 +++++----
 .../EditableMultipleOptionField.php           | 13 +++++----
 tests/UserDefinedFormTest.php                 | 28 +++++++++++++++++++
 4 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/code/model/UserDefinedForm.php b/code/model/UserDefinedForm.php
index 5539b31..b752ef9 100755
--- a/code/model/UserDefinedForm.php
+++ b/code/model/UserDefinedForm.php
@@ -409,6 +409,11 @@ class UserDefinedForm_Controller extends Page_Controller {
 
 					// Get the field which is effected
 					$formFieldWatch = EditableFormField::get()->byId($rule->ConditionFieldID);
+					
+					// Skip deleted fields
+					if(!$formFieldWatch) {
+						continue;
+					}
 
 					$fieldToWatch = $formFieldWatch->getSelectorField($rule);
 					$fieldToWatchOnLoad = $formFieldWatch->getSelectorField($rule, true);
diff --git a/code/model/editableformfields/EditableFormField.php b/code/model/editableformfields/EditableFormField.php
index 59586bc..1f37ed7 100755
--- a/code/model/editableformfields/EditableFormField.php
+++ b/code/model/editableformfields/EditableFormField.php
@@ -353,17 +353,20 @@ class EditableFormField extends DataObject {
 	}
 
 	/**
-	 * Delete this form from a given stage
+	 * Delete this field from a given stage
 	 *
 	 * Wrapper for the {@link Versioned} deleteFromStage function
 	 */
 	public function doDeleteFromStage($stage) {
-		$this->deleteFromStage($stage);
-
-		// Don't forget to delete the related custom rules...
-		foreach ($this->DisplayRules() as $rule) {
+		// Remove custom rules in this stage
+		$rules = Versioned::get_by_stage('EditableCustomRule', $stage)
+			->filter('ParentID', $this->ID);
+		foreach ($rules as $rule) {
 			$rule->deleteFromStage($stage);
 		}
+
+		// Remove record
+		$this->deleteFromStage($stage);
 	}
 
 	/**
diff --git a/code/model/editableformfields/EditableMultipleOptionField.php b/code/model/editableformfields/EditableMultipleOptionField.php
index cdea0df..3e5e545 100644
--- a/code/model/editableformfields/EditableMultipleOptionField.php
+++ b/code/model/editableformfields/EditableMultipleOptionField.php
@@ -95,7 +95,7 @@ class EditableMultipleOptionField extends EditableFormField {
 			}
 		}
 
-		$this->publish($fromStage, $toStage, $createNewVersion);
+		parent::doPublish($fromStage, $toStage, $createNewVersion);
 	}
 
 	/**
@@ -106,13 +106,14 @@ class EditableMultipleOptionField extends EditableFormField {
 	 * @return void
 	 */
 	public function doDeleteFromStage($stage) {
-		if($this->Options()) {
-			foreach($this->Options() as $option) {
-				$option->deleteFromStage($stage);
-			}
+		// Remove options
+		$options = Versioned::get_by_stage('EditableOption', $stage)
+			->filter('ParentID', $this->ID);
+		foreach($options as $option) {
+			$option->deleteFromStage($stage);
 		}
 
-		$this->deleteFromStage($stage);
+		parent::doDeleteFromStage($stage);
 	}
 
 	/**
diff --git a/tests/UserDefinedFormTest.php b/tests/UserDefinedFormTest.php
index 6e0e9b3..b2e2ed4 100644
--- a/tests/UserDefinedFormTest.php
+++ b/tests/UserDefinedFormTest.php
@@ -188,6 +188,34 @@ class UserDefinedFormTest extends FunctionalTest {
 
 		$liveText = Versioned::get_one_by_stage("EditableFormField", "Live", "\"EditableFormField_Live\".\"ID\" = $text->ID");
 		$this->assertTrue($liveText->Title == $text->Title);
+
+		// Add a display rule to the dropdown
+		$displayRule = new EditableCustomRule();
+		$displayRule->ParentID = $dropdown->ID;
+		$displayRule->ConditionFieldID = $text->ID;
+		$displayRule->write();
+		$ruleID = $displayRule->ID;
+
+		// Not live
+		$liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID");
+		$this->assertEmpty($liveRule);
+
+		// Publish form, it's now live
+		$form->doPublish();
+		$liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID");
+		$this->assertNotEmpty($liveRule);
+
+		// Remove rule
+		$displayRule->delete();
+
+		// Live rule still exists
+		$liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID");
+		$this->assertNotEmpty($liveRule);
+
+		// Publish form, it should remove this rule
+		$form->doPublish();
+		$liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID");
+		$this->assertEmpty($liveRule);
 	}
 
 	function testUnpublishing() {