fixed message when deleting with transactions off

Author: dimitri-yatsenko

datajoint/table.py

@@ -583,17 +583,16 @@ def cascade(table):
                 print("Nothing to delete.")
             if transaction:
                 self.connection.cancel_transaction()
+        elif not transaction:
+            print("Delete completed")
+        elif not safemode or user_choice("Commit deletes?", default="no") == "yes":
+            self.connection.commit_transaction()
+            if safemode:
+                print("Deletes committed.")
         else:
-            if not safemode or user_choice("Commit deletes?", default="no") == "yes":
-                if transaction:
-                    self.connection.commit_transaction()
-                if safemode:
-                    print("Deletes committed.")
-            else:
-                if transaction:
-                    self.connection.cancel_transaction()
-                if safemode:
-                    print("Deletes cancelled")
+            self.connection.cancel_transaction()
+            if safemode:
+                print("Deletes cancelled")
         return delete_count
 
     def drop_quick(self):