From 416abb3b7583446f7f2f0ca2a1f12d62aa649e16 Mon Sep 17 00:00:00 2001 From: Steven Guiheux Date: Fri, 28 Jun 2019 13:57:33 +0200 Subject: [PATCH] fix(api): delete workflow from oldworkflow if possible --- engine/api/workflow/dao.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/engine/api/workflow/dao.go b/engine/api/workflow/dao.go index 1a10175192..46d56ade42 100644 --- a/engine/api/workflow/dao.go +++ b/engine/api/workflow/dao.go @@ -890,8 +890,14 @@ func Update(ctx context.Context, db gorp.SqlExecutor, store cache.Store, w *sdk. } // Delete workflow data - if err := DeleteWorkflowData(db, *w); err != nil { - return sdk.WrapError(err, "Update> unable to delete workflow data(%d - %s)", w.ID, w.Name) + if uptOption.OldWorkflow != nil { + if err := DeleteWorkflowData(db, *uptOption.OldWorkflow); err != nil { + return sdk.WrapError(err, "unable to delete from old workflow data(%d - %s)", w.ID, w.Name) + } + } else { + if err := DeleteWorkflowData(db, *w); err != nil { + return sdk.WrapError(err, "unable to delete from workflow data(%d - %s)", w.ID, w.Name) + } } // Delete all node ID