From 690cebdccd78e1fabb686f236c171b12b504f608 Mon Sep 17 00:00:00 2001
From: Hayden Smith <hayden.g.smith@gmail.com>
Date: Wed, 8 Oct 2008 02:00:39 +0000
Subject: [PATCH] Merged from branches/nzct-trunk. Use 'svn log -c <changeset>
 -g' for full commit message. Merge includes stability fixes and minor
 refactor of TableListField and ComplexTableField.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63807 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/GenericDataAdmin.php             |  2 +-
 code/LeftAndMain.php                  |  2 +-
 code/SecurityAdmin.php                |  2 +-
 css/GenericDataAdmin.css              |  5 ++++-
 css/cms_right.css                     | 15 ++++++++++++++-
 javascript/LeftAndMain.js             |  2 +-
 javascript/LeftAndMain_right.js       | 13 ++++++++++++-
 javascript/SideTabs.js                |  3 ++-
 javascript/TinyMCEImageEnhancement.js |  6 +++---
 tests/RestfulServerTest.php           |  5 ++++-
 10 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/code/GenericDataAdmin.php b/code/GenericDataAdmin.php
index e979114e..b563afc8 100755
--- a/code/GenericDataAdmin.php
+++ b/code/GenericDataAdmin.php
@@ -412,7 +412,7 @@ HTML;
 				$result = $tmpItem;
 			}
 
-			if(strpos('->', $field) !== false) {
+			if(strpos($field, '->') !== false) {
 				list ($field, $caster) = explode("->", $field);
 			}
 			
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index dd159faf..0a2414cc 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -1143,4 +1143,4 @@ JS;
 	
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index f1bc3b2b..49e227e3 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -83,7 +83,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		$fieldVal = $_REQUEST[$fieldName];
 		$result = '';
 
-		$matches = DataObject::get("Member","$fieldName LIKE '" . addslashes($fieldVal) . "%'");
+		$matches = DataObject::get($this->stat('subitem_class'),"$fieldName LIKE '" . addslashes($fieldVal) . "%'");
 		if($matches) {
 			$result .= "<ul>";
 			foreach($matches as $match) {
diff --git a/css/GenericDataAdmin.css b/css/GenericDataAdmin.css
index 68942309..9a99f111 100755
--- a/css/GenericDataAdmin.css
+++ b/css/GenericDataAdmin.css
@@ -246,5 +246,8 @@ form#Form_EditForm #Form_ExportForm fieldset {
 
 /* Hides from IE-mac \*/
 * html .clear {height: 1%;}
-.clear {display: block;}
+.clear {
+	display: block;
+	clear: both;
+}
 /* End hide from IE-mac */
\ No newline at end of file
diff --git a/css/cms_right.css b/css/cms_right.css
index 0300cb6c..c29816c8 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -326,7 +326,7 @@
  * Autocomplete
  */
 .autocomplete {
-	background: #eee;
+	background: white;
 }
 	.autocomplete ul {
 		border: 1px solid #aaa;
@@ -492,3 +492,16 @@ div.originallang_holder.field.CompositeField.nolabel {
 	cursor: pointer;
 }
 
+.right form .field.confirmedpassword.nolabel .middleColumn {
+	background-color: #fff;	
+	padding: 0px;
+}
+
+	.right form .field.confirmedpassword.nolabel .middleColumn .middleColumn {
+		background-color: #e9e9e9;
+		padding: 3px;
+	}
+	
+.autocompleteoptions {
+	background-color: white;
+}
\ No newline at end of file
diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 593e3299..0866599f 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -48,7 +48,7 @@ function fixRightWidth() {
 	var rightWidth = bodyWidth - leftWidth - sepWidth -18;
 	
 	// Extra pane in right for insert image/flash/link things
-	if($('contentPanel').style.display != "none") {
+	if($('contentPanel') && $('contentPanel').style.display != "none") {
 		rightWidth -= 210;
 		$('contentPanel').style.left = leftWidth + sepWidth + rightWidth + sepWidth + 23 + 'px';
 	}
diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js
index a252b7bf..66e93e50 100755
--- a/javascript/LeftAndMain_right.js
+++ b/javascript/LeftAndMain_right.js
@@ -163,6 +163,9 @@ CMSForm.prototype = {
 		if(this.validate && !this.validate()) {
 			// TODO Automatically switch to the tab/position of the first error
 			statusMessage("Validation failed.", "bad");
+			
+			if($('Form_EditForm_action_save') && $('Form_EditForm_action_save').stopLoading) $('Form_EditForm_action_save').stopLoading();
+			
 			return false;
 		}
 		
@@ -171,6 +174,7 @@ CMSForm.prototype = {
 			__form.resetElements();
 			if(__callAfter) __callAfter();
 			if(__form.notify) __form.notify('PageSaved', __form.elements.ID.value);
+			if($('Form_EditForm_action_save') && $('Form_EditForm_action_save').stopLoading) $('Form_EditForm_action_save').stopLoading();
 			_AJAX_LOADING = false;
 		}
 		
@@ -191,6 +195,7 @@ CMSForm.prototype = {
 			onSuccess : success,
 			onFailure : function(response) {
 				errorMessage('Error saving content', response);
+				if($('Form_EditForm_action_save') && $('Form_EditForm_action_save').stopLoading) $('Form_EditForm_action_save').stopLoading();
 				_AJAX_LOADING = false;
 			}
 		});
@@ -308,11 +313,17 @@ CMSRightForm.prototype = {
 CMSForm.applyTo('#Form_SubForm', 'rightbottom');
 CMSRightForm.applyTo('#Form_EditForm', 'right');
 
-
 function action_save_right() {
 	_AJAX_LOADING = true;
 	$('Form_EditForm_action_save').value = ss.i18n._t('CMSMAIN.SAVING');
 	$('Form_EditForm_action_save').className = 'action loading';
+	$('Form_EditForm_action_save').stopLoading = function() {
+		if($('Form_EditForm_action_save') && $('Form_EditForm_action_save').className.indexOf('loading') != -1) {
+			$('Form_EditForm_action_save').value = 'Save';
+			Element.removeClassName($('Form_EditForm_action_save'), 'loading');
+		}
+	}	
+	
 	$('Form_EditForm').save(false);
 }
 
diff --git a/javascript/SideTabs.js b/javascript/SideTabs.js
index ad3d7b52..e4a66dae 100755
--- a/javascript/SideTabs.js
+++ b/javascript/SideTabs.js
@@ -213,7 +213,8 @@ SidePanel.prototype = {
 		var srcName = this.id.replace('_holder','');				
 		var id = $('Form_EditForm').elements.ID;
 		if(id) id = id.value; else id = "";
-		return 'admin/' + srcName + '/' + id + '?ajax=1';
+		// This assumes that admin/cms/ refers to CMSMain
+		return 'admin/cms/' + srcName + '/' + id + '?ajax=1';
 	},
 	
 	afterPanelLoaded : function() {
diff --git a/javascript/TinyMCEImageEnhancement.js b/javascript/TinyMCEImageEnhancement.js
index 94b7cc25..0ac8f9fd 100644
--- a/javascript/TinyMCEImageEnhancement.js
+++ b/javascript/TinyMCEImageEnhancement.js
@@ -135,9 +135,9 @@ TinyMCEImageEnhancement.prototype = {
         if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) {
            pv = getFlashPlayerVersion();
            if(pv.major < 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) {
-              $('AddFolderGroup').style.display = 'none';
-              $('PipeSeparator').style.display = 'none';
-              $('UploadGroup').style.display = 'none';
+              if($('AddFolderGroup')) $('AddFolderGroup').style.display = 'none';
+              if($('PipeSeparator')) $('PipeSeparator').style.display = 'none';
+              if($('UploadGroup')) $('UploadGroup').style.display = 'none';
               return;
            }
         }
diff --git a/tests/RestfulServerTest.php b/tests/RestfulServerTest.php
index 3db7e779..7659a1da 100644
--- a/tests/RestfulServerTest.php
+++ b/tests/RestfulServerTest.php
@@ -155,6 +155,9 @@ class RestfulServerTest extends SapphireTest {
 	}
 	
 	public function testUnsupportedMediaType() {
+		$_SERVER['PHP_AUTH_USER'] = 'user@test.com';
+		$_SERVER['PHP_AUTH_PW'] = 'user';
+
 		$url = "/api/v1/RestfulServerTest_Comment/1";
 		$data = "Comment||\/||updated"; // weird format
 		$headers = array('Content-Type' => 'text/weirdformat');
@@ -215,4 +218,4 @@ class RestfulServerTest_Page extends DataObject implements TestOnly {
 		'Content' => 'HTMLText',
 	);
 }
-?>
\ No newline at end of file
+?>