Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More fixes #391

Merged
merged 1 commit into from
Jan 10, 2025
Merged

More fixes #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItemDataGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions src/Backend/Modules/MediaLibrary/Domain/MediaItem/MediaItemSelectionDataGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Loading