merge 4.0 into 4.1

This commit is contained in:
Damian Mooyman 2017-05-01 17:37:50 +12:00
commit eea6572ac1

View File

@ -42,10 +42,10 @@ class UserFormRecipientItemRequest extends GridFieldDetailForm_ItemRequest
foreach ($fields as $field) { foreach ($fields as $field) {
$data->push(new ArrayData(array( $data->push(new ArrayData(array(
'Name' => $field->Name, 'Name' => $field->dbObject('Name'),
'Title' => $field->Title, 'Title' => $field->dbObject('Title'),
'Value' => '$' . $field->Name, 'Value' => DBField::create_field('Varchar', '$' . $field->Name),
'FormattedValue' => '$' . $field->Name 'FormattedValue' => DBField::create_field('Varchar', '$' . $field->Name)
))); )));
} }