From fe039857d8d7efb5d111e0bcfeeca37959cb2e94 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Tue, 3 Sep 2024 12:46:38 -0500 Subject: [PATCH 1/2] fix: show correct stacking info on mobile --- server/src/dtos/album.dto.ts | 2 +- server/src/repositories/album.repository.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts index b12847ee62537..36842f5ff6532 100644 --- a/server/src/dtos/album.dto.ts +++ b/server/src/dtos/album.dto.ts @@ -185,7 +185,7 @@ export const mapAlbum = (entity: AlbumEntity, withAssets: boolean, auth?: AuthDt hasSharedLink, startDate, endDate, - assets: (withAssets ? assets : []).map((asset) => mapAsset(asset, { auth })), + assets: (withAssets ? assets : []).map((asset) => mapAsset(asset, { auth, withStack: true })), assetCount: entity.assets?.length || 0, isActivityEnabled: entity.isActivityEnabled, order: entity.order, diff --git a/server/src/repositories/album.repository.ts b/server/src/repositories/album.repository.ts index fd3a89993a6bd..3ea130c2d6401 100644 --- a/server/src/repositories/album.repository.ts +++ b/server/src/repositories/album.repository.ts @@ -46,6 +46,7 @@ export class AlbumRepository implements IAlbumRepository { if (options.withAssets) { relations.assets = { exifInfo: true, + stack: { assets: true }, }; order.assets = { From b59f0ba5a76bc8c07c3b44ef4e23d820c262c8c3 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 3 Sep 2024 12:58:57 -0500 Subject: [PATCH 2/2] show stack info in album page --- mobile/lib/pages/common/album_viewer.page.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/lib/pages/common/album_viewer.page.dart b/mobile/lib/pages/common/album_viewer.page.dart index 33b314f3b105b..ea3f588922569 100644 --- a/mobile/lib/pages/common/album_viewer.page.dart +++ b/mobile/lib/pages/common/album_viewer.page.dart @@ -242,6 +242,7 @@ class AlbumViewerPage extends HookConsumerWidget { ), onRemoveFromAlbum: onRemoveFromAlbumPressed, editEnabled: data.ownerId == userId, + stackEnabled: data.ownerId == userId, ), ), AnimatedPositioned(