tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed importer not working because of i18n_singular_name(), just use the class name of the model instead

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66799 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2008-11-27 00:21:31 +00:00 committed by Sam Minnee
parent 45c0564c9d
commit 7db5f7b2e9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/ModelAdmin.php
View File

@ -351,9 +351,7 @@ class ModelAdmin_CollectionController extends Controller {
*/ */
public function ImportForm() { public function ImportForm() {
$modelName = $this->modelClass; $modelName = $this->modelClass;
$importers = $this->parentController->getModelImporters(); $importers = $this->parentController->getModelImporters();
if(!$importers || !isset($importers[$modelName])) return false; if(!$importers || !isset($importers[$modelName])) return false;
$fields = new FieldSet( $fields = new FieldSet(
@ -374,7 +372,7 @@ class ModelAdmin_CollectionController extends Controller {
$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(
'ModelName' => Convert::raw2att(str_replace(' ', '', singleton($modelName)->i18n_singular_name())), 'ModelName' => Convert::raw2att($modelName),
'Fields' => $specFields, 'Fields' => $specFields,
'Relations' => $specRelations, 'Relations' => $specRelations,
))->renderWith('ModelAdmin_ImportSpec'); ))->renderWith('ModelAdmin_ImportSpec');
@ -406,11 +404,19 @@ class ModelAdmin_CollectionController extends Controller {
* @param unknown_type $request * @param unknown_type $request
*/ */
function import($data, $form, $request) { function import($data, $form, $request) {
$modelName = singleton($data['ClassName'])->i18n_singular_name(); $modelName = $data['ClassName'];
$importers = $this->parentController->getModelImporters(); $importers = $this->parentController->getModelImporters();
$importerClass = $importers[$modelName]; $importerClass = $importers[$modelName];
$loader = new $importerClass($data['ClassName']); $loader = new $importerClass($data['ClassName']);
// File wasn't properly uploaded, show a reminder to the user
if(empty($_FILES['_CsvFile']['tmp_name'])) {
$form->sessionMessage(_t('ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'), 'good');
Director::redirectBack();
return false;
}
$results = $loader->load($_FILES['_CsvFile']['tmp_name']); $results = $loader->load($_FILES['_CsvFile']['tmp_name']);
$message = ''; $message = '';