From a4665a846db36532ab62c0479b370b996cf8046d Mon Sep 17 00:00:00 2001 From: Bruno Michel Date: Tue, 12 Nov 2024 16:40:11 +0100 Subject: [PATCH] Fix trigger creation for copied note --- model/note/copy.go | 5 ++++- model/note/note.go | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/model/note/copy.go b/model/note/copy.go index 2d248127dc5..eee54fdf560 100644 --- a/model/note/copy.go +++ b/model/note/copy.go @@ -71,7 +71,10 @@ func CopyFile(inst *instance.Instance, olddoc, newdoc *vfs.FileDoc) error { if cerr := file.Close(); cerr != nil && err == nil { err = cerr } - return err + if err != nil { + return err + } + return SetupTrigger(inst, newdoc.ID()) } func updateProsemirrorImageURLs(node *model.Node, mapping map[string]*Image) { diff --git a/model/note/note.go b/model/note/note.go index c7e1f1c9727..03f54f4077c 100644 --- a/model/note/note.go +++ b/model/note/note.go @@ -372,7 +372,7 @@ func writeFile(inst *instance.Instance, doc *Document, oldDoc *vfs.FileDoc) (fil if oldDoc == nil { fileDoc, err = newFileDoc(inst, doc) if err != nil { - return + return nil, err } } else { fileDoc = doc.asFile(inst, oldDoc) @@ -403,7 +403,7 @@ func writeFile(inst *instance.Instance, doc *Document, oldDoc *vfs.FileDoc) (fil if err == nil { break } else if !errors.Is(err, os.ErrExist) { - return + return nil, err } filename := strings.TrimSuffix(path.Base(basename), path.Ext(basename)) fileDoc.DocName = fmt.Sprintf("%s (%d).cozy-note", filename, i) @@ -421,7 +421,7 @@ func writeFile(inst *instance.Instance, doc *Document, oldDoc *vfs.FileDoc) (fil _ = saveToCache(inst, doc) } } - return + return fileDoc, err } // forceRename will update the FileDoc in CouchDB with the new name (but the