Merge pull request #1657 from creative-commoners/pulls/2.1/model-importer-fix

FIX Use valid class for model importers

Author: sabina-talipova

code/ModelAdmin.php

@@ -545,17 +545,20 @@ public function isManagedModel(string $modelClassOrModelTab): bool
     public function getModelImporters()
     {
         $importerClasses = $this->config()->get('model_importers');
+        $models = $this->getManagedModels();
 
         // fallback to all defined models if not explicitly defined
         if (is_null($importerClasses)) {
-            $models = $this->getManagedModels();
             foreach ($models as $modelName => $options) {
                 $importerClasses[$modelName] = 'SilverStripe\\Dev\\CsvBulkLoader';
             }
         }
 
         $importers = [];
         foreach ($importerClasses as $modelClass => $importerClass) {
+            if (isset($models[$modelClass])) {
+                $modelClass = $models[$modelClass]['dataClass'];
+            }
             $importer = new $importerClass($modelClass);
             if (ClassInfo::hasMethod($importer, 'setCheckPermissions')) {
                 $importer->setCheckPermissions(true);
@@ -675,8 +678,7 @@ public function import(array $data, Form $form): HTTPResponse
             $results = $loader->load($_FILES['_CsvFile']['tmp_name']);
         } catch (HTTPResponse_Exception $e) {
             $form->sessionMessage($e->getMessage(), ValidationResult::TYPE_ERROR);
-            $this->redirectBack();
-            return false;
+            return $this->redirectBack();
         }
 
         $message = '';