tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 18:09:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3'

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
Daniel Hensby 2015-08-18 16:41:21 +01:00
commit 84b70422b6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/code/ModelAdmin.php
View File

@ -354,7 +354,7 @@ abstract class ModelAdmin extends LeftAndMain {
$specRelations->push(new ArrayData(array('Name' => $name, 'Description' => $desc))); $specRelations->push(new ArrayData(array('Name' => $name, 'Description' => $desc)));
} }
$specHTML = $this->customise(array( $specHTML = $this->customise(array(
'ClassName' => str_replace('\\', '_', $className), 'ClassName' => $this->sanitiseClassName($this->modelClass),
'ModelName' => Convert::raw2att($modelName), 'ModelName' => Convert::raw2att($modelName),
'Fields' => $specFields, 'Fields' => $specFields,
'Relations' => $specRelations, 'Relations' => $specRelations,