From 08beafbcdb12a31e7234d4bae2e27960fa8f48a3 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 9 Aug 2008 04:06:52 +0000
Subject: [PATCH] (merged from branches/roa. use "svn log -c <changeset> -g
 <module-svn-path>" for detailed commit message)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60208 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/MemberTableField.php |  2 +-
 code/ModelAdmin.php       | 17 +++--------------
 code/StaticExporter.php   |  2 +-
 javascript/ModelAdmin.js  |  1 +
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 2eb6fc1b..226816ea 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -151,7 +151,7 @@ class MemberTableField extends ComplexTableField {
 	}
 
 	function AddLink() {
-		return "{$this->PopupBaseLink()}&methodName=add";
+		return "{$this->Link()}&methodName=add";
 	}
 
 	function SearchForm() {
diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 827c8a0e..818e0670 100644
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -211,18 +211,7 @@ class ModelAdmin_CollectionController extends Controller {
 	function getModelClass() {
 		return $this->modelClass;
 	}
-	
-	/**
-	 * Smashes a massive whole in the Law of Demeter.
-	 * 
-	 * http://en.wikipedia.org/wiki/Law_of_Demeter
-	 */
-	/* I've commented this out because it's not actually used anymore
-	function getParentController() {
-		return $this->parentController;
-	}
-	*/
-	
+		
 	/**
 	 * Delegate to different control flow, depending on whether the
 	 * URL parameter is a numeric type (record id) or string (action).
@@ -279,7 +268,7 @@ class ModelAdmin_CollectionController extends Controller {
 	 */
 	function search($request) {
 		$model = singleton($this->modelClass);
-		$searchKeys = array_intersect_key($request->getVars(), $model->searchableFields());
+		$searchKeys = array_intersect_key($request->getVars(), $model->searchable_fields());
 		$context = $model->getDefaultSearchContext();
 		$results = $context->getResultSet($searchKeys);
 		$output = "";
@@ -288,7 +277,7 @@ class ModelAdmin_CollectionController extends Controller {
 			foreach($results as $row) {
 				$uri = Director::absoluteBaseUrl();
 				$output .= "<tr title=\"{$uri}admin/crm/{$this->modelClass}/{$row->ID}/edit\">";
-				foreach($model->searchableFields() as $key=>$val) {
+				foreach($model->searchable_fields() as $key=>$val) {
 					$output .=  "<td>";
 					$output .=  $row->getField($key);
 					$output .=  "</td>";
diff --git a/code/StaticExporter.php b/code/StaticExporter.php
index f1ff0d6f..10cf1b43 100755
--- a/code/StaticExporter.php
+++ b/code/StaticExporter.php
@@ -75,7 +75,7 @@ class StaticExporter extends Controller {
 				$controllerClass = "{$page->class}_Controller";
 				if(class_exists($controllerClass)) {
 					$controller = new $controllerClass($page);
-					$pageContent = $controller->run( array() );
+					$pageContent = $controller->handleRequest(new HTTPRequest('GET',''))->getBody();
 					
 					// Write to file
 					if($fh = fopen($contentfile, 'w')) {
diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index 8cdb4f40..680db043 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -26,6 +26,7 @@ jQuery(document).ready(function() {
 	function saveRecord(uri, data) {
 		jQuery.post(uri, data, function(result){
 			jQuery('#right').html(result);
+			Behaviour.apply(); // refreshes ComplexTableField
 		});
 	}