github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-05-18 03:10:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove from album

Browse Source
This commit is contained in:
Jason Rasmussen
2026-04-08 21:10:06 -04:00
parent 8d67c1f820
commit 7801007b70
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/services/album.service.ts
+1 -3
View File
@@ -265,13 +265,11 @@ export class AlbumService extends BaseService {
} }
async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> { async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
await this.requireAccess({ auth, permission: Permission.AlbumAssetDelete, ids: [id] });
const album = await this.findOrFail(id, { withAssets: false }); const album = await this.findOrFail(id, { withAssets: false });
const results = await removeAssets( const results = await removeAssets(
auth, auth,
{ access: this.accessRepository, bulk: this.albumRepository }, { access: this.accessRepository, bulk: this.albumRepository },
{ parentId: id, assetIds: dto.ids, canAlwaysRemove: Permission.AlbumDelete }, { parentId: id, assetIds: dto.ids, canAlwaysRemove: Permission.AlbumUpdate },
); );
const removedIds = results.filter(({ success }) => success).map(({ id }) => id); const removedIds = results.filter(({ success }) => success).map(({ id }) => id);
server/src/utils/access.ts
-10
View File
@@ -223,16 +223,6 @@ const checkOtherAccess = async (access: AccessRepository, request: OtherAccessRe
return setUnion(isOwner, isShared); return setUnion(isOwner, isShared);
} }
case Permission.AlbumAssetDelete: {
const isOwner = await access.album.checkOwnerAccess(auth.user.id, ids);
const isShared = await access.album.checkSharedAlbumAccess(
auth.user.id,
setDifference(ids, isOwner),
AlbumUserRole.Editor,
);
return setUnion(isOwner, isShared);
}
case Permission.AssetUpload: { case Permission.AssetUpload: {
return ids.has(auth.user.id) ? new Set([auth.user.id]) : new Set<string>(); return ids.has(auth.user.id) ? new Set([auth.user.id]) : new Set<string>();
} }