BUGFIX Enforcing canEdit() checks in ComplexTableField_Popup - making…

… form readonly if the current user can't edit (from r110857) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112863 467b73ca-7a2a-4603-9d3b-597d59a354a9
silverstripe · Oct 19, 2010 · 2d82ae6 · 2d82ae6
1 parent d8a8635
commit 2d82ae6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php
@@ -1060,6 +1060,8 @@ function __construct($controller, $name, $fields, $validator, $readonly, $dataOb
 		}
 
 		parent::__construct($controller, $name, $fields, $actions, $validator);
+
+		if(!$this->dataObject->canEdit()) $this->makeReadonly();
 	}
 
 	function forTemplate() {

diff --git a/tests/forms/ComplexTableFieldTest.php b/tests/forms/ComplexTableFieldTest.php
@@ -38,6 +38,8 @@ function testCorrectNumberOfRowsInTable() {
 	}
 
 	function testAddingManyManyNewPlayer() {
+		$this->logInWithPermission('ADMIN');
+
 		$team = DataObject::get_one('ComplexTableFieldTest_Team', "\"Name\" = 'The Awesome People'");
 
 		$this->post('ComplexTableFieldTest_Controller/ManyManyForm/field/Players/AddForm', array(
@@ -57,6 +59,8 @@ function testAddingManyManyNewPlayer() {
 	}
 
 	function testAddingHasManyData() {
+		$this->logInWithPermission('ADMIN');
+
 		$team = DataObject::get_one('ComplexTableFieldTest_Team', "\"Name\" = 'The Awesome People'");
 
 		$this->post('ComplexTableFieldTest_Controller/HasManyForm/field/Sponsors/AddForm', array(