Allow re-requests for content review

eviljeff · eviljeff · commit a4b726f59368 · 2026-02-04T17:47:52.000Z
diff --git a/src/olympia/devhub/templates/devhub/includes/listing_visibility.html b/src/olympia/devhub/templates/devhub/includes/listing_visibility.html
@@ -0,0 +1,53 @@
+<h3>{{ distro_tag(amo.CHANNEL_LISTED)}} {{ _('Listing visibility') }}</h3>
+<div class="item" id="addon-current-state">
+  <div class="item_wrapper">
+    {% if addon.status == amo.STATUS_REJECTED %}
+        <label><input name="addon-state" value="disabled" type="radio"
+                {% if addon.status == amo.STATUS_DISABLED %}disabled="disabled"{% endif %}
+                {% if not addon.is_disabled %}checked="checked"{% endif %}
+                data-url="{{ addon.get_dev_url('rejected_review_request') }}"
+                class="rejected_review_request">
+        {{ _("{label_open}Rejected:{label_close} Add-on listing content is rejected. It won't be included in search results, "
+            "and its product page will be unavailable. New listed version submissions won't be accepted in this state.")|format_html(
+            label_open='<strong>'|safe, label_close='</strong>'|safe, site_url=settings.SITE_URL)|safe }}</label>
+    {% else %}
+        <label><input name="addon-state" value="listed" type="radio"
+                {% if addon.status == amo.STATUS_DISABLED %}disabled="disabled"{% endif %}
+                {% if not addon.is_disabled %}checked="checked"{% endif %}
+                data-url="{{ addon.get_dev_url('enable') }}"
+                class="enable-addon">
+        {{ _("{label_open}Visible:{label_close} Visible to everyone on {site_url} and included "
+            "in search results and product pages.")|format_html(
+            label_open='<strong>'|safe, label_close='</strong>'|safe, site_url=settings.SITE_URL)|safe }}</label>
+    {% endif %}
+
+    <br>
+    <label><input name="addon-state" value="hidden" type="radio"
+                {% if addon.status == amo.STATUS_DISABLED %}disabled="disabled"{% endif %}
+                {% if addon.is_disabled %}checked="checked"{% endif %}
+                class="disable-addon">
+    {{ _("{label_open}Invisible:{label_close} Won't be included in search results, and its product page will "
+            "indicate you disabled it. New version submissions for product "
+            "won't be accepted in this state.")|format_html(
+            label_open='<strong>'|safe, label_close='</strong>'|safe) }}</label>
+
+    {% if addon.status == amo.STATUS_REJECTED %}
+        <div>
+            {{ _('Our review found that your listing content violates the following Mozilla policy or policies:') }}
+            <ul>
+            {% for text in rejected_policy_texts %}
+                <li>{{ text }}</li>
+            {% endfor %}
+            </ul>
+            {% if rejection_manual_reasoning_text %}{{ rejection_manual_reasoning_text }}. {% endif %}
+        </div>
+        <div>
+            {{ _('To address these issues, please update your listing content and submit a new version for review.') }}
+            <button class="rejected_review_request"
+                data-url="{{ addon.get_dev_url('rejected_review_request') }}">
+                {{ _('I have addressed the issues and request a review') }}
+            </button>
+        </div>
+    {% endif %}
+  </div>
+</div>
diff --git a/src/olympia/devhub/templates/devhub/versions/list.html b/src/olympia/devhub/templates/devhub/versions/list.html
@@ -152,28 +152,7 @@ <h2>{{ addon.name }}</h2>
   {# Only show listing visibility if there are listed versions... or if somehow the add-on is already invisible,
      to allow developers to toggle it back so that they can upload listed versions #}
   {% if has_listed_versions or addon.disabled_by_user %}
-    <h3>{{ distro_tag(amo.CHANNEL_LISTED)}} {{ _('Listing visibility') }}</h3>
-    <div class="item" id="addon-current-state">
-      <div class="item_wrapper">
-        <label><input name="addon-state" value="listed" type="radio"
-                    {% if addon.status == amo.STATUS_DISABLED %}disabled="disabled"{% endif %}
-                    {% if not addon.is_disabled %}checked="checked"{% endif %}
-                    data-url="{{ addon.get_dev_url('enable') }}"
-                    class="enable-addon">
-        {{ _("{label_open}Visible:{label_close} Visible to everyone on {site_url} and included "
-             "in search results and product pages.")|format_html(
-             label_open='<strong>'|safe, label_close='</strong>'|safe, site_url=settings.SITE_URL)|safe }}</label>
-        <br>
-        <label><input name="addon-state" value="hidden" type="radio"
-                    {% if addon.status == amo.STATUS_DISABLED %}disabled="disabled"{% endif %}
-                    {% if addon.is_disabled %}checked="checked"{% endif %}
-                    class="disable-addon">
-        {{ _("{label_open}Invisible:{label_close} Won't be included in search results, and its product page will "
-              "indicate you disabled it. New version submissions for product "
-              "won't be accepted in this state.")|format_html(
-             label_open='<strong>'|safe, label_close='</strong>'|safe) }}</label>
-      </div>
-    </div>
+    {% include "devhub/includes/listing_visibility.html" %}
     {% if latest_listed_version or current_version %}
         <h3>{{ distro_tag(amo.CHANNEL_LISTED)}} {{ _('Listed versions') }}</h3>
     {% endif %}
diff --git a/src/olympia/devhub/urls.py b/src/olympia/devhub/urls.py
@@ -20,6 +20,11 @@
     re_path(r'^delete$', views.delete, name='devhub.addons.delete'),
     re_path(r'^disable$', views.disable, name='devhub.addons.disable'),
     re_path(r'^enable$', views.enable, name='devhub.addons.enable'),
+    re_path(
+        r'^rejected-review-request$',
+        views.rejected_review_request,
+        name='devhub.addons.rejected_review_request',
+    ),
     re_path(
         r'^cancel-latest-(?P<channel>listed|unlisted)$',
         views.cancel,
diff --git a/src/olympia/devhub/views.py b/src/olympia/devhub/views.py
@@ -423,6 +423,13 @@ def disable(request, addon_id, addon):
     return redirect(addon.get_dev_url('versions'))
 
 
+@dev_required
+@post_required
+def rejected_review_request(request, addon_id, addon):
+    # something something request a new content review
+    return redirect(addon.get_dev_url('versions'))
+
+
 # Can't use @dev_required, as the user is not a developer yet. Can't use
 # @addon_view_factory either, because it requires a developer for unlisted
 # add-ons. So we just @login_required and retrieve the addon ourselves in the
@@ -1306,6 +1313,14 @@ def version_list(request, addon_id, addon):
     rollback_form = forms.RollbackVersionForm(
         request.POST if was_rollback_submit else None, addon=addon
     )
+    rejected_log = (
+        addon.status == amo.STATUS_REJECTED
+        and ActivityLog.objects.filter(
+            addonlog__addon=addon, action=amo.LOG.REJECT_LISTING_CONTENT.id
+        )
+        .order_by('-created')
+        .first()
+    )
 
     if was_rollback_submit and rollback_form.is_valid():
         duplicate_addon_version_for_rollback.delay(
@@ -1335,6 +1350,12 @@ def version_list(request, addon_id, addon):
         .values_list('version', flat=True)
         .first(),
         'is_admin': is_admin,
+        'rejection_manual_reasoning_text': rejected_log.details.get('comments', '')
+        if rejected_log
+        else '',
+        'rejected_policy_texts': rejected_log.details.get('policy_texts', [])
+        if rejected_log
+        else [],
         'rollback_form': rollback_form,
         'session_id': request.session.session_key,
         'versions': versions,
