fixed product modifier symbols in complextablefields and DOM fields

cbryer · Mar 9, 2012 · 809d3c9 · 809d3c9
1 parent 3fe9345
commit 809d3c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/Code/OptionItem.php b/Code/OptionItem.php
@@ -72,13 +72,16 @@ function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus=false){
 		return '';
 	}
 
-	function weightModifierWithSymbol(){
+	function getWeightModifierWithSymbol(){
 		return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
 	}
-	function priceModifierWithSymbol(){
+	function getPriceModifierWithSymbol(){
 		return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
 	}
-	function codeModifierWithSymbol(){
+	function getCodeModifierWithSymbol(){
 		return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
 	}
+	function getProductOptionGroupTitle(){
+		return $this->ProductOptionGroup()->Title;
+	}
 }
diff --git a/Code/ProductPage.php b/Code/ProductPage.php
@@ -77,7 +77,7 @@ public function getCMSFields(){
 
 		$fields->addFieldToTab('Root.Content.Details',$optgrpfield);
 
-		/*
+
 		//functions do not work in FieldList with DataObjectManager
 		$optionSet = new $hmctf(
 			$this,
@@ -88,23 +88,7 @@ public function getCMSFields(){
 				'weightModifierWithSymbol' => 'Weight Modifier',
 				'priceModifierWithSymbol' => 'Price Modifier',
 				'codeModifierWithSymbol' => 'Code Modifier',
-				'ProductOptionGroup.Title' => 'Option Group'
-			),
-			'getCMSFields',
-			'',
-			'ProductOptionGroupID'
-		);
-		*/
-		$optionSet = new $hmctf(
-			$this,
-			'ProductOptions',
-			'OptionItem',
-			array(
-				'Title' => 'Title',
-				'WeightModifier' => 'Weight Modifier',
-				'PriceModifier' => 'Price Modifier',
-				'CodeModifier' => 'Code Modifier',
-				'ProductOptionGroupID' => 'Option Group'
+				'productOptionGroupTitle' => 'Option Group'
 			),
 			'getCMSFields',
 			'',