Merge pull request #391 from jonasdekeukelaere/fixes

More fixes

Author: jonasdekeukelaere

src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItemDataGrid.php

@@ -64,14 +64,14 @@ private function getColumnHeaderLabels(Type $type): array
     private function getColumnsThatNeedToBeHidden(Type $type): array
     {
         if ($type->isImage()) {
-            return ['storageType', 'shardingFolderName', 'type', 'mime'];
+            return ['storage_type', 'sharding_folder_name', 'type', 'mime'];
         }
 
         if ($type->isMovie()) {
-            return ['shardingFolderName', 'type', 'mime'];
+            return ['sharding_folder_name', 'type', 'mime'];
         }
 
-        return ['storageType', 'shardingFolderName', 'type', 'mime', 'url'];
+        return ['storage_type', 'sharding_folder_name', 'type', 'mime', 'url'];
     }
 
     public static function getDataGrid(Type $type, int $folderId = null, string $searchQuery = null): DataGridDatabase
@@ -176,7 +176,7 @@ private function setExtras(Type $type, int $folderId = null): void
             $this->setColumnFunction(
                 [BackendDataGridFunctions::class, 'showImage'],
                 [
-                    Model::get('media_library.storage.local')->getWebDir() . '/[shardingFolderName]',
+                    Model::get('media_library.storage.local')->getWebDir() . '/[sharding_folder_name]',
                     '[url]',
                     '[url]',
                     Model::createUrlForAction('MediaItemEdit') . '&id=[id]' . '&folder=' . $folderId,

src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItemSelectionDataGrid.php

@@ -53,14 +53,14 @@ private function getColumnHeaderLabels(Type $type): array
     private function getColumnsThatNeedToBeHidden(Type $type): array
     {
         if ($type->isImage()) {
-            return ['storageType', 'shardingFolderName', 'type', 'mime'];
+            return ['storage_type', 'sharding_folder_name', 'type', 'mime'];
         }
 
         if ($type->isMovie()) {
-            return ['shardingFolderName', 'type', 'mime'];
+            return ['sharding_folder_name', 'type', 'mime'];
         }
 
-        return ['storageType', 'shardingFolderName', 'type', 'mime', 'url'];
+        return ['storage_type', 'sharding_folder_name', 'type', 'mime', 'url'];
     }
 
     public static function getDataGrid(Type $type, int $folderId = null): DataGridDatabase
@@ -115,7 +115,7 @@ private function setExtras(Type $type): void
                     'showImage',
                 ],
                 [
-                    Model::get('media_library.storage.local')->getWebDir() . '/[shardingFolderName]',
+                    Model::get('media_library.storage.local')->getWebDir() . '/[sharding_folder_name]',
                     '[url]',
                     '[url]',
                     null,