Fix order

Author: stsewd

readthedocs/builds/forms.py

@@ -99,12 +99,12 @@ def clean_slug(self):
         return slug
 
     def save(self, commit=True):
-        obj = super().save(commit=commit)
-
+        # If the slug was changed, and the version was active,
+        # we need to delete all the resources, since the old slug is used in several places.
         if "slug" in self.changed_data and self._was_active and self.instance.active:
-            obj.recreate()
-            return obj
+            obj.clean_resources()
 
+        obj = super().save(commit=commit)
         obj.post_save(was_active=self._was_active)
         return obj
 

readthedocs/builds/models.py

@@ -414,6 +414,7 @@ def clean_resources(self):
         clean_project_resources(project=self.project, version=self)
         self.built = False
         self.save()
+        self.purge_cdn()
 
     def post_save(self, was_active=False):
         """
@@ -435,17 +436,17 @@ def post_save(self, was_active=False):
         # If the version is deactivated, we need to clean up the files.
         if was_active and not self.active:
             self.clean_resources()
+            return
         # If the version is activated, we need to trigger a build.
         if not was_active and self.active:
             trigger_build(project=self.project, version=self)
-        # Purge the cache from the CDN.
+        # Purge the cache from the CDN for any other changes.
+        self.purge_cdn()
+
+    def purge_cdn(self):
+        """Purge the cache from the CDN."""
         version_changed.send(sender=self.__class__, version=self)
 
-    def recreate(self):
-        self.clean_resources()
-        trigger_build(project=self.project, version=self)
-        version_changed.send(sender=self.__class__, version=self)
-
     @property
     def identifier_friendly(self):
         """Return display friendly identifier."""