diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php index 108639c5b..5af2b9c1c 100644 --- a/code/ModelAdmin.php +++ b/code/ModelAdmin.php @@ -658,7 +658,7 @@ public function import(array $data, Form $form): HTTPResponse $importers = $this->getModelImporters(); /** @var BulkLoader $loader */ - $loader = $importers[$this->modelClass]; + $loader = $importers[$this->modelTab]; // File wasn't properly uploaded, show a reminder to the user if (empty($_FILES['_CsvFile']['tmp_name']) || diff --git a/tests/php/ModelAdminTest.php b/tests/php/ModelAdminTest.php index 8302bee70..d4fea6ade 100644 --- a/tests/php/ModelAdminTest.php +++ b/tests/php/ModelAdminTest.php @@ -11,13 +11,12 @@ use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\Session; use SilverStripe\Core\Injector\Injector; +use SilverStripe\Dev\FunctionalTest; use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\GridField\GridFieldExportButton; use SilverStripe\Forms\GridField\GridFieldImportButton; use SilverStripe\Forms\GridField\GridFieldPrintButton; use SilverStripe\Security\Permission; -use SilverStripe\Dev\FunctionalTest; -use SilverStripe\View\ArrayData; class ModelAdminTest extends FunctionalTest {