From 68f7be24ed93e1c0b2b1e5d4237509c0f437a54c Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 24 Jan 2008 00:13:05 +0000
Subject: [PATCH] Merged revisions 48178 via svnmerge from
 http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r48178 | aoneil | 2008-01-18 09:04:53 +1300 (Fri, 18 Jan 2008) | 2 lines

  Fix incorrect text boxes being set on an ajax request
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48540 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 forms/ManyManyComplexTableField.php     | 2 +-
 javascript/RelationComplexTableField.js | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/forms/ManyManyComplexTableField.php b/forms/ManyManyComplexTableField.php
index fad3ac758..00d34fd41 100644
--- a/forms/ManyManyComplexTableField.php
+++ b/forms/ManyManyComplexTableField.php
@@ -65,7 +65,7 @@ class ManyManyComplexTableField extends HasManyComplexTableField {
 					$query->select[] = $k;
 			}
 			$parent = $this->controller->ClassName;
-			$query->select[] = "IF(`{$this->manyManyParentClass}ID` IS NULL, '0', '1') AS $this->joinField";
+			$query->select[] = "IF(`{$this->manyManyParentClass}ID` IS NULL, '0', '1') AS Checked";
 		}
 		return clone $query;
 	}
diff --git a/javascript/RelationComplexTableField.js b/javascript/RelationComplexTableField.js
index b80bd362b..2e98a29e5 100644
--- a/javascript/RelationComplexTableField.js
+++ b/javascript/RelationComplexTableField.js
@@ -24,13 +24,14 @@ RelationComplexTableField.prototype = {
 		// 2) Initialize The Array Or Update The Hidden Input Field And The HTML Table
 		
 		var checkedListName = checkedList.getAttribute( 'name' );
-		if( checkedListNameArray == null ) {
+		//if( checkedListNameArray == null ) {
 			checkedListNameArray = [];
 			checkedListNameArray.push( checkedListName );
 			checkedArray = [];
 			if( checkedList.getAttribute( 'value' ) )
 				checkedArray.push( checkedList.getAttribute( 'value' ).split( ',' ) );
-		}
+		//}
+		/*
 		else if( checkedListNameArray.indexOf( checkedListName ) < 0 ) {
 			checkedListNameArray.push( checkedListName );
 			if( checkedList.getAttribute( 'value' ) )
@@ -55,7 +56,7 @@ RelationComplexTableField.prototype = {
 				else
 					markingInput.removeAttribute( 'checked' );
 			}
-		}
+		} */
 				
 		// 3) Create The Rules
 		
@@ -111,4 +112,4 @@ RelationComplexTableField.prototype = {
 
 RelationComplexTableField.applyTo('#Form_EditForm div.HasOneComplexTableField');
 RelationComplexTableField.applyTo('#Form_EditForm div.HasManyComplexTableField');
-RelationComplexTableField.applyTo('#Form_EditForm div.ManyManyComplexTableField');
\ No newline at end of file
+RelationComplexTableField.applyTo('#Form_EditForm div.ManyManyComplexTableField');