Merge branch '3.1' into 3

silverstripe · Jun 17, 2024 · 55842ba · 55842ba
2 parents 9df3d37 + 1287d59
commit 55842ba
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/UserSecurityReport.php b/src/UserSecurityReport.php
@@ -72,7 +72,7 @@ public function description()
      */
     public function columns()
     {
-        $columns = self::config()->columns;
+        $columns = static::config()->columns;
         if (!Security::config()->get('login_recording')) {
             unset($columns['LastLoggedIn']);
         }
@@ -138,7 +138,7 @@ public function canView($member = null)
     public function getReportField()
     {
         $gridField = parent::getReportField();
-        $gridField->setModelClass(self::class);
+        $gridField->setModelClass(UserSecurityReport::class);
         $gridConfig = $gridField->getConfig();
         $gridConfig->removeComponentsByType([GridFieldPrintButton::class, GridFieldExportButton::class]);
         $gridConfig->addComponents(