]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Merge branch 'dev' into feature-ai feature-ai 10319/head
authorshamoon <4887959+shamoon@users.noreply.github.com>
Tue, 26 Aug 2025 20:30:16 +0000 (13:30 -0700)
committershamoon <4887959+shamoon@users.noreply.github.com>
Tue, 26 Aug 2025 20:30:16 +0000 (13:30 -0700)
1  2 
pyproject.toml
src-ui/src/app/components/app-frame/app-frame.component.html
src-ui/src/app/components/document-detail/document-detail.component.spec.ts
src-ui/src/app/components/document-detail/document-detail.component.ts
src/paperless/views.py
uv.lock

diff --cc pyproject.toml
Simple merge
index b5a9ffe75b37efe4f484a1b901950c2f1d6b6dab,29bcf8fa8937184b984887d536eaf0f012e0c2f1..2618662a02abe908b8831436d3a578b96af357ec
@@@ -665,22 -671,28 +683,15 @@@ export class DocumentDetailComponen
          PermissionType.Document
        )
      ) {
 -      this.documentsService
 -        .getSuggestions(doc.id)
 -        .pipe(
 -          first(),
 -          takeUntil(this.unsubscribeNotifier),
 -          takeUntil(this.docChangeNotifier)
 -        )
 -        .subscribe({
 -          next: (result) => {
 -            this.suggestions = result
 -          },
 -          error: (error) => {
 -            this.suggestions = null
 -            this.toastService.showError(
 -              $localize`Error retrieving suggestions.`,
 -              error
 -            )
 -          },
 -        })
 +      this.tagService.getCachedMany(doc.tags).subscribe((tags) => {
 +        // only show suggestions if document has inbox tags
 +        if (tags.some((tag) => tag.is_inbox_tag)) {
 +          this.getSuggestions()
 +        }
 +      })
      }
      this.title = this.documentTitlePipe.transform(doc.title)
-     const docFormValues = Object.assign({}, doc)
-     docFormValues['permissions_form'] = {
-       owner: doc.owner,
-       set_permissions: doc.permissions,
-     }
-     this.documentForm.patchValue(docFormValues, { emitEvent: false })
-     if (!this.userCanEdit) this.documentForm.disable()
+     this.prepareForm(doc)
    }
  
    get customFieldFormFields(): FormArray {
Simple merge
diff --cc uv.lock
Simple merge