Update status while disabled (bug 1042968)

Author: Rob Hudson

mkt/developers/tests/test_views_versions.py

@@ -387,6 +387,17 @@ def test_delete_version(self):
         eq_(str(version[0].status[0]),
             str(amo.MKT_STATUS_CHOICES[amo.STATUS_DELETED]))
 
+    def test_delete_version_while_disabled(self):
+        self.app.update(disabled_by_user=True)
+        version = self.app.latest_version
+
+        res = self.client.post(self.delete_url, {'version_id': version.pk})
+        eq_(res.status_code, 302)
+
+        eq_(self.get_app().status, amo.STATUS_NULL)
+        version = Version.with_deleted.get(pk=version.pk)
+        assert version.deleted
+
     def test_anonymous_delete_redirects(self):
         self.client.logout()
         version = self.app.versions.latest()

mkt/webapps/models.py

@@ -612,29 +612,6 @@ def get_icon_url(self, size):
             return static_url('ADDON_ICON_URL') % (
                 split_id.group(2) or 0, self.id, size, suffix)
 
-    @write
-    def update_status(self):
-        if (self.status in [amo.STATUS_NULL, amo.STATUS_DELETED] or
-            self.is_disabled):
-            return
-
-        def logit(reason, old=self.status):
-            log.info('Changing addon status [%s]: %s => %s (%s).'
-                     % (self.id, old, self.status, reason))
-            amo.log(amo.LOG.CHANGE_STATUS, self.get_status_display(), self)
-
-        versions = self.versions.all()
-        if not versions.exists():
-            self.update(status=amo.STATUS_NULL)
-            logit('no versions')
-        elif not (versions.filter(files__isnull=False).exists()):
-            self.update(status=amo.STATUS_NULL)
-            logit('no versions with files')
-        elif (self.status == amo.STATUS_PUBLIC and
-              not versions.filter(files__status=amo.STATUS_PUBLIC).exists()):
-            self.update(status=amo.STATUS_PENDING)
-            logit('no reviewed files')
-
     @staticmethod
     def attach_related_versions(addons, addon_dict=None):
         if addon_dict is None:
@@ -1784,8 +1761,7 @@ def mark_done(self):
         self.update(status=amo.WEBAPPS_UNREVIEWED_STATUS)
 
     def update_status(self, **kwargs):
-        if (self.is_deleted or self.is_disabled or
-            self.status == amo.STATUS_BLOCKED):
+        if self.is_deleted or self.status == amo.STATUS_BLOCKED:
             return
 
         def _log(reason, old=self.status):