Merge branch '1.13' into 1

silverstripe · Feb 3, 2024 · c998e1a · c998e1a
2 parents 6749a84 + 725a9a1
commit c998e1a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
@@ -610,17 +610,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);

diff --git a/tests/php/ModelAdminTest.php b/tests/php/ModelAdminTest.php
@@ -164,6 +164,15 @@ public function testGetGridField()
         );
     }
 
+    public function testGetModelImporters()
+    {
+        $admin = new ModelAdminTest\MultiModelAdmin();
+        $importers = $admin->getModelImporters();
+        $this->assertCount(2, $importers);
+        $this->assertArrayHasKey(Contact::class, $importers);
+        $this->assertArrayHasKey(Player::class, $importers);
+    }
+
     public function testGetManagedModels()
     {
         $admin = new ModelAdminTest\MultiModelAdmin();