Skip to content

Commit 6925ecb

Browse files
Merge pull request #1743 from silverstripeltd/pulls/1.13/fix-model-admin-import
FIX: Update model class importer key
2 parents 66a937a + 78eb177 commit 6925ecb

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

code/ModelAdmin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ public function import(array $data, Form $form): HTTPResponse
658658

659659
$importers = $this->getModelImporters();
660660
/** @var BulkLoader $loader */
661-
$loader = $importers[$this->modelClass];
661+
$loader = $importers[$this->modelTab];
662662

663663
// File wasn't properly uploaded, show a reminder to the user
664664
if (empty($_FILES['_CsvFile']['tmp_name']) ||

tests/php/ModelAdminTest.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
use SilverStripe\Control\HTTPRequest;
1212
use SilverStripe\Control\Session;
1313
use SilverStripe\Core\Injector\Injector;
14+
use SilverStripe\Dev\FunctionalTest;
1415
use SilverStripe\Forms\GridField\GridField;
1516
use SilverStripe\Forms\GridField\GridFieldExportButton;
1617
use SilverStripe\Forms\GridField\GridFieldImportButton;
1718
use SilverStripe\Forms\GridField\GridFieldPrintButton;
1819
use SilverStripe\Security\Permission;
19-
use SilverStripe\Dev\FunctionalTest;
20-
use SilverStripe\View\ArrayData;
2120

2221
class ModelAdminTest extends FunctionalTest
2322
{

0 commit comments

Comments
 (0)