Merge branch 'dev' into feature-ai

This commit is contained in:
shamoon
2025-10-23 16:38:21 -07:00
committed by GitHub
54 changed files with 408 additions and 404 deletions

View File

@@ -96,9 +96,11 @@
<button ngbDropdownItem (click)="mergeSelected()" [disabled]="!userCanAdd || list.selected.size < 2">
<i-bs name="journals"></i-bs>&nbsp;<ng-container i18n>Merge</ng-container>
</button>
<button ngbDropdownItem (click)="emailSelected()" [disabled]="!userCanEdit">
<i-bs name="envelope"></i-bs>&nbsp;<ng-container i18n>Email</ng-container>
</button>
@if (emailEnabled) {
<button ngbDropdownItem (click)="emailSelected()">
<i-bs name="envelope"></i-bs>&nbsp;<ng-container i18n>Email</ng-container>
</button>
}
</div>
</div>
</div>

View File

@@ -904,6 +904,10 @@ export class BulkEditorComponent
})
}
public get emailEnabled(): boolean {
return this.settings.get(SETTINGS_KEYS.EMAIL_ENABLED)
}
emailSelected() {
const allHaveArchiveVersion = this.list.documents
.filter((d) => this.list.selected.has(d.id))

View File

@@ -146,7 +146,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
}
public getOriginalObject(object: T): T {
return this.unfilteredData.find((d) => d.id == object.id)
return this.unfilteredData.find((d) => d?.id == object?.id) || object
}
reloadData(extraParams: { [key: string]: any } = null) {