BUGFIX Clearing Requirements in ScaffoldingComplexTableField, and fixed constructor arguments

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@74927 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-04-22 01:47:45 +00:00 committed by Sam Minnee
parent 9999f8edd8
commit bdce229639

View File

@ -5,9 +5,7 @@
* @package forms * @package forms
* @subpackage fields-relational * @subpackage fields-relational
*/ */
class ScaffoldingComplexTableField_Popup extends Form { class ScaffoldingComplexTableField_Popup extends ComplexTableField_Popup {
protected $sourceClass;
protected $dataObject;
public static $allowed_actions = array( public static $allowed_actions = array(
'filter', 'record', 'httpSubmission', 'handleAction', 'handleField' 'filter', 'record', 'httpSubmission', 'handleAction', 'handleField'
@ -15,6 +13,8 @@ class ScaffoldingComplexTableField_Popup extends Form {
function __construct($controller, $name, $fields, $validator, $readonly, $dataObject) { function __construct($controller, $name, $fields, $validator, $readonly, $dataObject) {
$this->dataObject = $dataObject; $this->dataObject = $dataObject;
Requirements::clear();
$actions = new FieldSet(); $actions = new FieldSet();
if(!$readonly) { if(!$readonly) {
@ -26,7 +26,7 @@ class ScaffoldingComplexTableField_Popup extends Form {
$fields->push(new HiddenField("ComplexTableField_Path", Director::absoluteBaseURL())); $fields->push(new HiddenField("ComplexTableField_Path", Director::absoluteBaseURL()));
parent::__construct($controller, $name, $fields, $actions, $validator); parent::__construct($controller, $name, $fields, $validator, $readonly, $dataObject);
} }
/** /**