Reapply "Revert test changes"

This reverts commit 1e4f98faf06e15597bf6723b851d46b4b3860b23.
This commit is contained in:
shamoon 2026-03-07 19:21:29 -08:00
parent 1e4f98faf0
commit 31cc96fafa
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
<div class="d-flex flex-wrap gap-4">
<div class="d-flex flex-wrap align-items-center gap-2" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.Document }">
<span class="me-2" i18n>Edit:</span>
<label class="me-2" i18n>Edit:</label>
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Tag)) {
<pngx-filterable-dropdown title="Tags" icon="tag-fill" i18n-title
filterPlaceholder="Filter tags" i18n-filterPlaceholder

View File

@ -550,7 +550,7 @@ def merge(
if delete_originals and handoff_asn is not None:
overrides.asn = handoff_asn
logger.info("Adding the merged document to the task queue.")
logger.info("Adding merged document to the task queue.")
consume_task = consume_file.s(
ConsumableDocument(