tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-05-31 20:26:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge b59f0ba5a76bc8c07c3b44ef4e23d820c262c8c3 into 63437529e1224f5e7879ce567b1a4502fb97573b

Browse Source
This commit is contained in:
Alex 2024-10-02 03:04:23 +07:00 committed by GitHub
commit 3b55e335cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/lib/pages/common/album_viewer.page.dart
View File

@ -242,6 +242,7 @@ class AlbumViewerPage extends HookConsumerWidget {
), ),
onRemoveFromAlbum: onRemoveFromAlbumPressed, onRemoveFromAlbum: onRemoveFromAlbumPressed,
editEnabled: data.ownerId == userId, editEnabled: data.ownerId == userId,
stackEnabled: data.ownerId == userId,
), ),
), ),
AnimatedPositioned( AnimatedPositioned(

2
server/src/dtos/album.dto.ts
View File

@ -185,7 +185,7 @@ export const mapAlbum = (entity: AlbumEntity, withAssets: boolean, auth?: AuthDt
hasSharedLink, hasSharedLink,
startDate, startDate,
endDate, endDate,
assets: (withAssets ? assets : []).map((asset) => mapAsset(asset, { auth })), assets: (withAssets ? assets : []).map((asset) => mapAsset(asset, { auth, withStack: true })),
assetCount: entity.assets?.length || 0, assetCount: entity.assets?.length || 0,
isActivityEnabled: entity.isActivityEnabled, isActivityEnabled: entity.isActivityEnabled,
order: entity.order, order: entity.order,

1
server/src/repositories/album.repository.ts
View File

@ -46,6 +46,7 @@ export class AlbumRepository implements IAlbumRepository {
if (options.withAssets) { if (options.withAssets) {
relations.assets = { relations.assets = {
exifInfo: true, exifInfo: true,
stack: { assets: true },
}; };
order.assets = { order.assets = {