disable addon reviewer tools action to ContentActionDisableAddon

mozilla · Jan 22, 2025 · fb3e679 · fb3e679
1 parent 789244b
commit fb3e679
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/olympia/reviewers/tests/test_utils.py b/src/olympia/reviewers/tests/test_utils.py
@@ -3519,6 +3519,7 @@ def test_record_decision_called_everywhere_checkbox_shown_listed(self):
                 },
                 'disable_addon': {
                     'should_email': True,
+                    'uses_content_action': True,
                     'cinder_action': DECISION_ACTIONS.AMO_DISABLE_ADDON,
                 },
                 'resolve_reports_job': {'should_email': False, 'cinder_action': None},
@@ -3543,6 +3544,7 @@ def test_record_decision_called_everywhere_checkbox_shown_listed(self):
                 },
                 'disable_addon': {
                     'should_email': True,
+                    'uses_content_action': True,
                     'cinder_action': DECISION_ACTIONS.AMO_DISABLE_ADDON,
                 },
                 'resolve_reports_job': {'should_email': False, 'cinder_action': None},
@@ -3604,6 +3606,7 @@ def test_record_decision_called_everywhere_checkbox_shown_unlisted(self):
                 },
                 'disable_addon': {
                     'should_email': True,
+                    'uses_content_action': True,
                     'cinder_action': DECISION_ACTIONS.AMO_DISABLE_ADDON,
                 },
                 'resolve_reports_job': {'should_email': False, 'cinder_action': None},

diff --git a/src/olympia/reviewers/utils.py b/src/olympia/reviewers/utils.py
@@ -1592,9 +1592,8 @@ def enable_addon(self):
 
     def disable_addon(self):
         """Force disable the add-on and all versions."""
-        self.addon.force_disable(skip_activity_log=True)
         log.info('Sending email for %s' % (self.addon))
-        self.record_decision(amo.LOG.FORCE_DISABLE)
+        self.record_decision(amo.LOG.FORCE_DISABLE, action_completed=False)
 
     def request_legal_review(self):
         """Forward add-on and/or job to legal via Cinder."""