Merge pull request #5487 from rtfd/search-delete-objects

ericholscher · web-flow · commit 3699b4eaf6ef · 2019-03-20T12:42:41.000-03:00
Fix bug that caused search objects not to delete
diff --git a/readthedocs/projects/tasks.py b/readthedocs/projects/tasks.py
@@ -1324,10 +1324,12 @@ def _manage_imported_files(version, path, commit):
     )
     # Keep the objects into memory to send it to signal
     instance_list = list(delete_queryset)
-    # Safely delete from database
-    delete_queryset.delete()
     # Always pass the list of instance, not queryset.
+    # These objects must exist though,
+    # because the task will query the DB for the objects before deleting
     bulk_post_delete.send(sender=HTMLFile, instance_list=instance_list)
+    # Safely delete from database
+    delete_queryset.delete()
 
     # Delete ImportedFiles from previous versions
     (

Original file line number	Diff line number	Diff line change
`@@ -1324,10 +1324,12 @@ def _manage_imported_files(version, path, commit):`
`1324`	`1324`	`)`
`1325`	`1325`	`# Keep the objects into memory to send it to signal`
`1326`	`1326`	`instance_list = list(delete_queryset)`
`1327`		`- # Safely delete from database`
`1328`		`- delete_queryset.delete()`
`1329`	`1327`	`# Always pass the list of instance, not queryset.`
	`1328`	`+ # These objects must exist though,`
	`1329`	`+ # because the task will query the DB for the objects before deleting`
`1330`	`1330`	`bulk_post_delete.send(sender=HTMLFile, instance_list=instance_list)`
	`1331`	`+ # Safely delete from database`
	`1332`	`+ delete_queryset.delete()`
`1331`	`1333`
`1332`	`1334`	`# Delete ImportedFiles from previous versions`
`1333`	`1335`	`(`