Skip to content

Commit

Permalink
Merge pull request #389 from jonasdekeukelaere/fixes
Browse files Browse the repository at this point in the history
Fix datagrids for new naming
  • Loading branch information
tijsverkoyen authored Dec 17, 2024
2 parents 3bbf62f + f4cf140 commit 8694657
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public function __construct(Type $type, int $folderId = null, string $searchQuer
parent::__construct(
'SELECT i.id, i.storageType, i.type, i.url, i.title, i.shardingFolderName,
COUNT(gi.mediaItemId) as num_connected, i.mime, UNIX_TIMESTAMP(i.createdOn) AS createdOn
FROM MediaItem AS i
LEFT OUTER JOIN MediaGroupMediaItem as gi ON gi.mediaItemId = i.id
FROM media_item AS i
LEFT OUTER JOIN media_group_media_item as gi ON gi.mediaItemId = i.id
WHERE i.type = ?' . $this->getWhere($folderId, $searchQuery) . ' GROUP BY i.id',
$this->getParameters($type, $folderId, $searchQuery)
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public function __construct(Type $type, int $folderId = null)
parent::__construct(
'SELECT i.url AS directUrl, i.id, i.storageType, i.type, i.url, i.title, i.shardingFolderName,
COUNT(gi.mediaItemId) AS num_connected, i.mime, UNIX_TIMESTAMP(i.createdOn) AS createdOn
FROM MediaItem AS i
LEFT OUTER JOIN MediaGroupMediaItem AS gi ON gi.mediaItemId = i.id
FROM media_item AS i
LEFT OUTER JOIN media_group_media_item AS gi ON gi.mediaItemId = i.id
WHERE i.type = ?' . $this->getWhere($folderId) . ' GROUP BY i.id',
$this->getParameters($type, $folderId)
);
Expand Down

0 comments on commit 8694657

Please sign in to comment.