tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-05-24 02:13:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge b59f0ba5a76bc8c07c3b44ef4e23d820c262c8c3 into b0bcc6c03ecedff0d756a0e54352586672cea761

Browse Source
This commit is contained in:
Alex 2024-10-02 06:30:21 +07:00 committed by GitHub
commit 9e11bb3196
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,
editEnabled: data.ownerId == userId,
stackEnabled: data.ownerId == userId,
),
),
AnimatedPositioned(

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

@ -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,

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

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