Merge branch '3'

Conflicts:
	.travis.yml
This commit is contained in:
Daniel Hensby 2015-08-18 16:41:21 +01:00
commit 84b70422b6

View File

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