Skip to content

Commit 575c6aa

Browse files
authored
Fix trigger creation for copied note (#4488)
2 parents f626f40 + a4665a8 commit 575c6aa

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

model/note/copy.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ func CopyFile(inst *instance.Instance, olddoc, newdoc *vfs.FileDoc) error {
7171
if cerr := file.Close(); cerr != nil && err == nil {
7272
err = cerr
7373
}
74-
return err
74+
if err != nil {
75+
return err
76+
}
77+
return SetupTrigger(inst, newdoc.ID())
7578
}
7679

7780
func updateProsemirrorImageURLs(node *model.Node, mapping map[string]*Image) {

model/note/note.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ func writeFile(inst *instance.Instance, doc *Document, oldDoc *vfs.FileDoc) (fil
372372
if oldDoc == nil {
373373
fileDoc, err = newFileDoc(inst, doc)
374374
if err != nil {
375-
return
375+
return nil, err
376376
}
377377
} else {
378378
fileDoc = doc.asFile(inst, oldDoc)
@@ -403,7 +403,7 @@ func writeFile(inst *instance.Instance, doc *Document, oldDoc *vfs.FileDoc) (fil
403403
if err == nil {
404404
break
405405
} else if !errors.Is(err, os.ErrExist) {
406-
return
406+
return nil, err
407407
}
408408
filename := strings.TrimSuffix(path.Base(basename), path.Ext(basename))
409409
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
421421
_ = saveToCache(inst, doc)
422422
}
423423
}
424-
return
424+
return fileDoc, err
425425
}
426426

427427
// forceRename will update the FileDoc in CouchDB with the new name (but the

0 commit comments

Comments
 (0)