tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 13:48:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4011 from dhensby/pulls/model-admin-import-naming

Browse Source 
Using sigular name for model import form rather than class name
This commit is contained in:
Loz Calver 2015-03-19 21:09:19 +00:00
commit 2d1fa46be8
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/code/ModelAdmin.php
View File

@ -334,25 +334,28 @@ abstract class ModelAdmin extends LeftAndMain {
* @return Form * @return Form
*/ */
public function ImportForm() { public function ImportForm() {
$modelName = $this->modelClass; $modelSNG = singleton($this->modelClass);
$modelName = $modelSNG->i18n_singular_name();
// check if a import form should be generated // check if a import form should be generated
if(!$this->showImportForm || (is_array($this->showImportForm) && !in_array($modelName,$this->showImportForm))) { if(!$this->showImportForm ||
(is_array($this->showImportForm) && !in_array($this->modelClass, $this->showImportForm))
) {
return false; return false;
} }
$importers = $this->getModelImporters(); $importers = $this->getModelImporters();
if(!$importers || !isset($importers[$modelName])) return false; if(!$importers || !isset($importers[$this->modelClass])) return false;
if(!singleton($modelName)->canCreate(Member::currentUser())) return false; if(!$modelSNG->canCreate(Member::currentUser())) return false;
$fields = new FieldList( $fields = new FieldList(
new HiddenField('ClassName', _t('ModelAdmin.CLASSTYPE'), $modelName), new HiddenField('ClassName', _t('ModelAdmin.CLASSTYPE'), $this->modelClass),
new FileField('_CsvFile', false) new FileField('_CsvFile', false)
); );
// get HTML specification for each import (column names etc.) // get HTML specification for each import (column names etc.)
$importerClass = $importers[$modelName]; $importerClass = $importers[$this->modelClass];
$importer = new $importerClass($modelName); $importer = new $importerClass($this->modelClass);
$spec = $importer->getImportSpec(); $spec = $importer->getImportSpec();
$specFields = new ArrayList(); $specFields = new ArrayList();
foreach($spec['fields'] as $name => $desc) { foreach($spec['fields'] as $name => $desc) {