FIX Set the CSV importer based on the tab, not the model (#1676)

silverstripe · Feb 8, 2024 · 8a3833e · 8a3833e
1 parent b4f13ed
commit 8a3833e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
@@ -621,14 +621,15 @@ public function getModelImporters()
 
         $importers = [];
         foreach ($importerClasses as $modelClass => $importerClass) {
+            $tab = $modelClass;
             if (isset($models[$modelClass])) {
                 $modelClass = $models[$modelClass]['dataClass'];
             }
             $importer = new $importerClass($modelClass);
             if (ClassInfo::hasMethod($importer, 'setCheckPermissions')) {
                 $importer->setCheckPermissions(true);
             }
-            $importers[$modelClass] = $importer;
+            $importers[$tab] = $importer;
         }
 
         return $importers;

diff --git a/tests/php/ModelAdminTest.php b/tests/php/ModelAdminTest.php
@@ -168,9 +168,11 @@ public function testGetModelImporters()
     {
         $admin = new ModelAdminTest\MultiModelAdmin();
         $importers = $admin->getModelImporters();
-        $this->assertCount(2, $importers);
+        $this->assertCount(4, $importers);
         $this->assertArrayHasKey(Contact::class, $importers);
         $this->assertArrayHasKey(Player::class, $importers);
+        $this->assertArrayHasKey('Player', $importers);
+        $this->assertArrayHasKey('cricket-players', $importers);
     }
 
     public function testGetManagedModels()