Mercurial > gemma

changeset 1359:3ff916e853d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove the import track in both cases accepted/declined.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 26 Nov 2018 17:23:40 +0100
parents ac6aa40005b4
children da7ee82ad5d6
files pkg/controllers/importqueue.go
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/controllers/importqueue.go	Mon Nov 26 17:14:56 2018 +0100
+++ b/pkg/controllers/importqueue.go	Mon Nov 26 17:23:40 2018 +0100
@@ -369,15 +369,17 @@
 			}
 		}
 
-		if _, err = tx.ExecContext(ctx, deleteImportTrackSQL, id); err != nil {
-			return
-		}
 	} else {
 		if _, err = tx.ExecContext(ctx, deleteImportDataSQL, id); err != nil {
 			return
 		}
 	}
 
+	// Remove the import track
+	if _, err = tx.ExecContext(ctx, deleteImportTrackSQL, id); err != nil {
+		return
+	}
+
 	// Log the decision and set the final state.
 	session, _ := auth.GetSession(req)
 	who := session.User