Fix trigger creation for copied note (#4488)

cozy · Nov 13, 2024 · 575c6aa · 575c6aa
2 parents f626f40 + a4665a8
commit 575c6aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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