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

fix(server): remove offline assets from trash (#12199)

Browse Source 
* use port not taken by immich-dev for e2e

* remove offline files from trash
This commit is contained in:
Jonathan Jogenfors
2024-09-02 01:06:35 +02:00
committed by GitHub
parent 28bc7f318e
commit 39141d3f1c
4 changed files with 67 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/repositories/asset.repository.ts
View File

@@ -527,7 +527,12 @@ export class AssetRepository implements IAssetRepository {
});
}
getWith(pagination: PaginationOptions, property: WithProperty, libraryId?: string): Paginated<AssetEntity> {
getWith(
pagination: PaginationOptions,
property: WithProperty,
libraryId?: string,
withDeleted = false,
): Paginated<AssetEntity> {
let where: FindOptionsWhere<AssetEntity> | FindOptionsWhere<AssetEntity>[] = {};
switch (property) {
@@ -557,6 +562,7 @@ export class AssetRepository implements IAssetRepository {
return paginate(this.repository, pagination, {
where,
withDeleted,
order: {
// Ensures correct order when paginating
createdAt: 'ASC',