tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

merge to 2.0_inform changeset 31642, 32399, 32478, 32480

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45384 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Normann Lou 2007-11-22 02:17:16 +00:00
parent 378fc8a4ab
commit 99e45e48c3
1 changed files with 114 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

360
forms/TableField.php
View File

@ -15,7 +15,7 @@
* @param $sourceClass string The source class of this field * @param $sourceClass string The source class of this field
* @param $fieldList array An array of field headings of Fieldname => Heading Text (eg. heading1) * @param $fieldList array An array of field headings of Fieldname => Heading Text (eg. heading1)
* @param $fieldTypes array An array of field types of fieldname => fieldType (eg. formfield). Do not use for extra data/hiddenfields. * @param $fieldTypes array An array of field types of fieldname => fieldType (eg. formfield). Do not use for extra data/hiddenfields.
* @param $filterField string DEPRECATED The actual limiting filter, eg. 1 (please use $sourceFilter in the form "ParentID = 1" instead) * @param $filterField string The actual limiting filter, eg. 1 (Legacy, please use $sourceFilter in the form "ParentID = 1" instead)
* @param $sourceFilter string The filter you wish to limit the objects by * @param $sourceFilter string The filter you wish to limit the objects by
* @param $editExisting boolean (Note: Has to stay on this position for legacy reasons) * @param $editExisting boolean (Note: Has to stay on this position for legacy reasons)
* @param $sourceSort string * @param $sourceSort string
@ -81,15 +81,16 @@ class TableField extends TableListField {
* table, we can set this wantDefaultAddRow to be false. * table, we can set this wantDefaultAddRow to be false.
* @param boolean $wantDefaultAddRow * @param boolean $wantDefaultAddRow
*/ */
protected $wantDefaultAddRow = true; protected $wantDefaultAddRow = true;
function __construct($name, $sourceClass, $fieldList, $fieldTypes, $filterField = null, function __construct($name, $sourceClass, $fieldList, $fieldTypes, $filterField = null,
$sourceFilter = null, $editExisting = true, $sourceSort = null, $sourceJoin = null) { $sourceFilter = null, $editExisting = true, $sourceSort = null, $sourceJoin = null) {
$this->fieldTypes = $fieldTypes; $this->fieldTypes = $fieldTypes;
$this->filterField = $filterField; $this->filterField = $filterField;
$this->editExisting = $editExisting; $this->editExisting = $editExisting;
parent::__construct($name, $sourceClass, $fieldList, $sourceFilter, $sourceSort, $sourceJoin); parent::__construct($name, $sourceClass, $fieldList, $sourceFilter, $sourceSort, $sourceJoin);
Requirements::javascript('sapphire/javascript/TableField.js'); Requirements::javascript('sapphire/javascript/TableField.js');
@ -107,7 +108,7 @@ class TableField extends TableListField {
$class = $this->fieldTypes[$fieldName]; $class = $this->fieldTypes[$fieldName];
if(is_object($class)) $class = ""; if(is_object($class)) $class = "";
$class = $class." ".$extraClass; $class = $class." ".$extraClass;
$headings[] = new ArrayData(array("Name" => $fieldName, "Title" => $fieldTitle, "Class" => $class)); $headings[] = new ArrayData(array("Name" => $fieldName, "Title" => $fieldTitle, "Class" => $class), "");
$i++; $i++;
} }
return new DataObjectSet($headings); return new DataObjectSet($headings);
@ -138,13 +139,20 @@ class TableField extends TableListField {
// Legacy: If a filterField is specified and the sourceFilter is a valid ID (old format) // Legacy: If a filterField is specified and the sourceFilter is a valid ID (old format)
$SQL_filter = Convert::raw2sql($this->sourceFilter); $SQL_filter = Convert::raw2sql($this->sourceFilter);
$SQL_filterField = $this->filterField; $SQL_filterField = $this->filterField;
$items = DataObject::get($this->sourceClass,"`$SQL_filterField` = '$SQL_filter'", $this->sourceSort, $this->sourceJoin); $items = DataObject::get($this->sourceClass,"`$SQL_filterField` = '$SQL_filter'", $this->sourceSort, $this->sourceJoin, $limit);
} else { } else {
// get query // get query
$dataQuery = $this->getQuery(); $dataQuery = $this->getQuery();
$dataQuery->limit = $limit;
// get data // get data
$records = $dataQuery->execute(); $records = $dataQuery->execute();
$items = singleton($this->sourceClass)->buildDataObjectSet($records);
$items = new DataObjectSet();
foreach($records as $record){
if(!get_class($record)) $record = new DataObject($record);
$items->push($record);
}
} }
} }
@ -196,7 +204,6 @@ class TableField extends TableListField {
{ {
// TODO Needs to be attached to a form existing in the DOM-tree // TODO Needs to be attached to a form existing in the DOM-tree
$form = new Form($this, 'EditForm', $fieldset, new FieldSet()); $form = new Form($this, 'EditForm', $fieldset, new FieldSet());
$form->loadDataFrom($item);
$row = new TableField_Item($item, $this, $form, $this->fieldTypes); $row = new TableField_Item($item, $this, $form, $this->fieldTypes);
$fields = array_merge($fields, $row->Fields()->toArray()); $fields = array_merge($fields, $row->Fields()->toArray());
} }
@ -206,42 +213,6 @@ class TableField extends TableListField {
return $fields; return $fields;
} }
function SubmittedFieldSet(&$sourceItems){
$fields = array ();
if($rows = $_POST[$this->name]){
if(count($rows)){
foreach($rows as $idx => $row){
if($idx == 'new'){
$newitems = ArrayLib::invert($row);
if(count($newitems)){
$sourceItems = new DataObjectSet();
foreach($newitems as $k => $newitem){
$fieldset = $this->FieldSetForRow();
if($fieldset){
$newitem[ID] = "new".$k;
foreach($newitem as $k => $v){
if(array_key_exists($k, $this->extraData)){
unset($newitem[$k]);
}
}
$sourceItem = new DataObject($newitem);
if(!$sourceItem->isEmpty()){
$sourceItems->push($sourceItem);
$form = new Form($this, "EditForm", $fieldset, new FieldSet());
$form->loadDataFrom($sourceItem);
$item = new TableField_Item($sourceItem, $this, $form, $this->fieldTypes);
$fields = array_merge($fields, $item->Fields()->toArray());
}
}
}
}
}
}
}
}
return $fields;
}
/** /**
* @return array * @return array
*/ */
@ -253,17 +224,17 @@ class TableField extends TableListField {
* Saves the Dataobjects contained in the field * Saves the Dataobjects contained in the field
*/ */
function saveInto(DataObject $record) { function saveInto(DataObject $record) {
// CMS sometimes tries to set the value to one. // CMS sometimes tries to set the value to one.
if(is_array($this->value)){ if(is_array($this->value)){
// Sort into proper array // Sort into proper array
$this->value = ArrayLib::invert($this->value); $this->value = ArrayLib::invert($this->value);
$dataObjects = $this->sortData($this->value, $record->ID); $dataObjects = $this->sortData($this->value);
if($dataObjects['new']) { if($dataObjects['new']) {
$newFields = $this->sortData($dataObjects['new'], $record->ID); $newFields = $this->sortData($dataObjects['new']);
} }
$savedObj = $this->saveData($dataObjects, $this->editExisting); $savedObj = $this->saveData($dataObjects, $this->editExisting);
if($savedObj && $newFields) { if($savedObj && $newFields) {
$savedObj += $this->saveData($newFields,false); $savedObj += $this->saveData($newFields,false);
} else if($newFields) { } else if($newFields) {
@ -305,16 +276,6 @@ class TableField extends TableListField {
return $fieldset; return $fieldset;
} }
function performReadonlyTransformation() {
$this->permissions = array('show');
return $this;
}
function performDisabledTransformation() {
$this->permissions = array('show');
return $this;
}
/** /**
* Needed for Form->callfieldmethod. * Needed for Form->callfieldmethod.
*/ */
@ -342,88 +303,81 @@ class TableField extends TableListField {
// add hiddenfields // add hiddenfields
if($this->extraData) { if($this->extraData) {
foreach($this->extraData as $fieldName => $fieldValue) { foreach($this->extraData as $fieldName => $fieldValue) {
$fieldset->push(new HiddenField($fieldName)); $fieldset->push(new HiddenField($fieldName));
}
} }
}
$form = new Form(null, null, $fieldset, new FieldSet()); $form = new Form(null, null, $fieldset, new FieldSet());
if($dataObjects) { if($dataObjects) {
foreach ($dataObjects as $objectid => $fieldValues) { foreach ($dataObjects as $objectid => $fieldValues) {
// we have to "sort" new data first, and process it in a seperate saveData-call (see setValue()) // we have to "sort" new data first, and process it in a seperate saveData-call (see setValue())
if($objectid === "new") { if($objectid === "new") {
continue; continue;
} }
// extra data was creating fields, but // extra data was creating fields, but
if($this->extraData) { if($this->extraData) $fieldValues = array_merge( $this->extraData, $fieldValues );
$fieldValues = array_merge( $this->extraData, $fieldValues );
} $hasData = false;
$obj = new $this->sourceClass();
$hasData = false;
$obj = new $this->sourceClass();
if($ExistingValues) {
$obj->ID = $objectid;
}
// Legacy: Use the filter as a predefined relationship-ID
if(!empty($this->filterField) && intval($this->sourceFilter) > 0) {
$filterField = $this->filterField;
$obj->$filterField = $this->sourceFilter;
}
// Determine if there is changed data for saving
$dataFields = array();
foreach($fieldValues as $type => $value) {
if(is_array($this->extraData)){ // if the field is an actual datafield (not a preset hiddenfield)
if(!in_array($type, array_keys($this->extraData))){
$dataFields[$type] = $value;
}
}else{ // all fields are real
$dataFields[$type] = $value;
}
}
$dataValues = ArrayLib::array_values_recursive($dataFields); if($ExistingValues) {
$obj->ID = $objectid;
foreach($dataValues as $value) {
if(!empty($value)) {
$hasData = true;
}
}
// save
if($hasData) {
$form->loadDataFrom($fieldValues, true);
$form->saveInto($obj);
$objectid = $obj->write();
$savedObj[$objectid] = "Updated";
}
} }
return $savedObj; // Legacy: Use the filter as a predefined relationship-ID
if(!empty($this->filterField) && intval($this->sourceFilter) > 0) {
$filterField = $this->filterField;
$obj->$filterField = $this->sourceFilter;
}
// Determine if there is changed data for saving
$dataFields = array();
foreach($fieldValues as $type => $value) {
if(is_array($this->extraData)){ // if the field is an actual datafield (not a preset hiddenfield)
if(!in_array($type, array_keys($this->extraData))){
$dataFields[$type] = $value;
}
}else{ // all fields are real
$dataFields[$type] = $value;
}
}
$dataValues = ArrayLib::array_values_recursive($dataFields);
foreach($dataValues as $value) {
if(!empty($value)) {
$hasData = true;
}
}
// save
if($hasData) {
$form->loadDataFrom($fieldValues, true);
$form->saveInto($obj);
$objectid = $obj->write();
$savedObj[$objectid] = "Updated";
}
} }
return $savedObj;
}
} }
/** /**
* organises the data in the appropriate manner for saving * organises the data in the appropriate manner for saving
*/ */
function sortData($data, $recordID = null) { function sortData($data) {
$dataObjects = array();
if($data) { if($data) {
$dataObjects = array();
foreach($data as $field => $rowData) { foreach($data as $field => $rowData) {
$i = 0; $i = 0;
$blank = 0; $blank = 0;
if(!is_array($rowData)) continue; if(!is_array($rowData)) continue;
foreach($rowData as $id => $value) { foreach($rowData as $id => $value) {
if($value == '$RecordID') $value = $recordID;
if($value){ if($value){
$dataObjects[$id][$field] = $value; $dataObjects[$id][$field] = $value;
}else{ }else{
@ -434,8 +388,8 @@ class TableField extends TableListField {
// TODO ADD stuff for removing rows with incomplete data // TODO ADD stuff for removing rows with incomplete data
} }
return $dataObjects;
} }
return $dataObjects;
} }
/** /**
@ -474,12 +428,12 @@ class TableField extends TableListField {
* @return String * @return String
*/ */
function delete() { function delete() {
$childId = Convert::raw2sql($_REQUEST['childID']); $childId = Convert::raw2sql($_REQUEST['childID']);
if (is_numeric($childId)) { if (is_numeric($childId)) {
$childObject = DataObject::get_by_id($this->sourceClass, $childId); $childObject = DataObject::get_by_id($this->sourceClass, $childId);
if($childObject) { if($childObject) {
$childObject->delete(); $childObject->delete();
return 1; return 1;
} }
}else{ }else{
return 0; return 0;
@ -499,33 +453,17 @@ class TableField extends TableListField {
$js = ""; $js = "";
$fields = $this->FieldSet(); $fields = $this->FieldSet();
$fields = new FieldSet($fields);
// TODO doesn't automatically update validation when adding a row // TODO doesn't automatically update validation when adding a row
foreach($fields as $field) { foreach($fields as $field) {
//if the field type has some special specific specification for validation of itself //if the field type has some special specific specification for validation of itself
$js .= $field->jsValidation($this->form->class."_".$this->form->Name()); $js .= $field->jsValidation();
} }
// TODO Implement custom requiredFields // TODO Implement custom requiredFields
$items = $this->sourceItems(); if($this->requiredFields) {
if($this->requiredFields&&$items->count()) {
foreach ($this->requiredFields as $field) { foreach ($this->requiredFields as $field) {
/*if($fields->dataFieldByName($field)) { if($fields->dataFieldByName($field)) {
$js .= "\t\t\t\t\trequire('$field');\n"; $js .= "\t\t\t\t\trequire('$field');\n";
}*/
foreach($items as $item){
$cellName = $this->Name().'['.$item->ID.']['.$field.']';
$js .= "\n";
if($fields->dataFieldByName($cellName)) {
$js .= <<<JS
if(typeof fromAnOnBlur != 'undefined'){
if(fromAnOnBlur.name == '$cellName')
require(fromAnOnBlur);
}else{
require('$cellName');
}
JS;
}
} }
} }
} }
@ -535,54 +473,32 @@ JS;
function php($data) { function php($data) {
$valid = true; $valid = true;
if($items = $this->sourceItems()) {
if($data['methodName'] != 'delete'){ foreach($items as $item) {
$fields = $this->FieldSet(); // Load the data in to a temporary form (for correct field types)
$fields = new FieldSet($fields); $fieldset = $this->FieldSetForRow();
if ($fieldset)
}else{ {
return $valid; $form = new Form(null, null, $fieldset, new FieldSet());
} $row = new TableField_Item($item, $this, $form, $this->fieldTypes);
} $fields = array_merge($fields, $row->Fields()->toArray());
function validate($validator){
$valid = true;
$fields = $this->SubmittedFieldSet($sourceItemsNew);
$fields = new FieldSet($fields);
foreach($fields as $field){
$valid = $field->validate($validator)&&$valid;
}
//debug::show($this->form->Message());
if($this->requiredFields&&$sourceItemsNew&&$sourceItemsNew->count()) {
foreach ($this->requiredFields as $field) {
foreach($sourceItemsNew as $item){
$cellName = $this->Name().'['.$item->ID.']['.$field.']';
$cName = $this->Name().'[new]['.$field.'][]';
if($fieldObj = $fields->dataFieldByName($cellName)) {
if(!trim($fieldObj->Value())){
$title = $fieldObj->Title();
$errorMessage .= sprintf(
_t('TableField.ISREQUIRED', "In %s '%s' is required."),
$this->name,
$title
);
$errorMessage .= "<br />";
}
}
} }
} }
} }
$fields = new FieldSet($fields);
if($errorMessage){ foreach($fields as $field) {
$messageType .= "validation"; $valid = ($field->validate($this) && $valid);
$message .= "<br />".$errorMessage;
$validator->validationError($this->name, $message, $messageType);
} }
return $valid; if($this->requiredFields) {
foreach($this->requiredFields as $field) {
if($fields->dataFieldByName($field) && !$data[$field]) {
$this->validationError($field,'"' . strip_tags($field) . '" is required',"required");
}
}
}
} }
function setRequiredFields($fields) { function setRequiredFields($fields) {
@ -634,33 +550,12 @@ class TableField_Item extends TableListField_Item {
if($this->fieldset) { if($this->fieldset) {
$i=0; $i=0;
foreach($this->fieldset as $field) { foreach($this->fieldset as $field) {
$origFieldName = $field->Name(); $combinedFieldName = $this->parent->Name() . "[" . $this->ID . "][" . $field->Name() . "]";
// set unique fieldname with id
$combinedFieldName = $this->parent->Name() . "[" . $this->ID . "][" . $origFieldName . "]";
if($this->isAddRow) $combinedFieldName .= '[]'; if($this->isAddRow) $combinedFieldName .= '[]';
$origFieldName = $field->Name();
// get value
if(strpos($origFieldName,'.') === false) {
$value = $field->dataValue();
} else {
// this supports the syntax fieldName = Relation.RelatedField
$fieldNameParts = explode('.', $origFieldName) ;
$tmpItem = $this->item;
for($j=0;$j<sizeof($fieldNameParts);$j++) {
$relationMethod = $fieldNameParts[$j];
$idField = $relationMethod . 'ID';
if($j == sizeof($fieldNameParts)-1) {
$value = $tmpItem->$relationMethod;
} else {
$tmpItem = $tmpItem->$relationMethod();
}
}
}
$field->Name = $combinedFieldName; $field->Name = $combinedFieldName;
$field->setValue($field->dataValue()); $field->value = $field->dataValue();
$field->setExtraClass('col'.$i); $field->addExtraClass('col'.$i);
$field->setForm($this->data); $field->setForm($this->data);
// transformation // transformation
@ -675,18 +570,6 @@ class TableField_Item extends TableListField_Item {
} }
// formatting
$item = $this->item;
$value = $field->Value();
if(array_key_exists($origFieldName, $this->parent->fieldFormatting)) {
$format = str_replace('$value', "__VAL__", $this->parent->fieldFormatting[$origFieldName]);
$format = preg_replace('/\$([A-Za-z0-9-_]+)/','$item->$1', $format);
$format = str_replace('__VAL__', '$value', $format);
eval('$value = "' . $format . '";');
$field->dontEscape = true;
$field->setValue($value);
}
$this->fields[] = $field; $this->fields[] = $field;
$i++; $i++;
} }
@ -694,27 +577,19 @@ class TableField_Item extends TableListField_Item {
// New record // New record
} else { } else {
$list = $this->parent->FieldList(); $list = $this->parent->FieldList();
$i=0; foreach($list as $shortFieldName => $fieldTitle) {
foreach($list as $fieldName => $fieldTitle) {
if(strpos($fieldName, ".")) {
$shortFieldName = substr($fieldName, strpos($fieldName, ".")+1, strlen($fieldName));
} else {
$shortFieldName = $fieldName;
}
$combinedFieldName = $this->parent->Name() . "[new][" . $shortFieldName . "][]"; $combinedFieldName = $this->parent->Name() . "[new][" . $shortFieldName . "][]";
$fieldType = $this->fieldTypes[$fieldName]; $fieldType = $this->fieldTypes[$shortFieldName];
if(isset($fieldType->class) && is_subclass_of($fieldType, 'FormField')) { if(isset($fieldType->class) && is_subclass_of($fieldType, 'FormField')) {
$field = clone $fieldType; // we can't use the same instance all over, as we change names $fieldType = clone $fieldType; // we can't use the same instance all over, as we change names
$field->Name = $combinedFieldName; $fieldType->Name = $combinedFieldName;
$this->fields[] = $fieldType;
} elseif(strpos($fieldType, '(') === false) { } elseif(strpos($fieldType, '(') === false) {
//echo ("<li>Type: ".$fieldType." fieldName: ". $filedName. " Title: ".$fieldTitle."</li>"); //echo ("<li>Type: ".$fieldType." fieldName: ". $filedName. " Title: ".$fieldTitle."</li>");
$field = new $fieldType($combinedFieldName,$fieldTitle); $this->fields[] = new $fieldType($combinedFieldName,$fieldTitle);
} else { } else {
$field = eval("return new " . $fieldType . ";"); $this->fields[] = eval("return new " . $fieldType . ";");
} }
$field->setExtraClass('col'.$i);
$this->fields[] = $field;
$i++;
} }
} }
@ -753,22 +628,15 @@ class TableField_Item extends TableListField_Item {
*/ */
function BaseLink() { function BaseLink() {
$parent = $this->parent; $parent = $this->parent;
$action = $parent->FormAction(); return $parent->FormAction() . "&action_callfieldmethod&fieldName=". $parent->Name() . "&childID=" . $this->ID;
if(substr($action, -1, 1) !== '&'){
$action = $action."&";
}
$action = str_replace('&', '&amp;', $action);
return $action . "action_callfieldmethod=1&amp;fieldName=". $parent->Name() . "&amp;childID=" . $this->ID;
} }
/** /**
* Runs the delete() method on the Tablefield parent. * Runs the delete() method on the Tablefield parent.
* Allows the deletion of objects via ajax * Allows the deletion of objects via ajax
*/ */
function DeleteLink() { function DeleteLink() {
return $this->BaseLink() . "&amp;methodName=delete"; return $this->BaseLink() . "&methodName=delete";
} }
} }
?> ?>