fix: prevent release editing if marked as spam

- correct alert_if_spam macro reference
- move comment to the right place

django/core/models.py

@@ -143,6 +143,8 @@ class ModeratedContent(index.Indexed, models.Model):
     spam_moderation = models.ForeignKey(
         SpamModeration, null=True, blank=True, on_delete=models.SET_NULL
     )
+    # need to have this denormalized field to allow for filtering out spam content
+    # https://docs.wagtail.org/en/stable/topics/search/indexing.html#filtering-on-index-relatedfields
     is_marked_spam = models.BooleanField(
         default=False,
         help_text=_(
@@ -647,9 +649,6 @@ class Event(ModeratedContent, ClusterableModel):
     tags = ClusterTaggableManager(through=EventTag, blank=True)
     external_url = models.URLField(blank=True)
     is_deleted = models.BooleanField(default=False)
-    # need to have this denormalized field to allow for filtering out spam content
-    # https://docs.wagtail.org/en/stable/topics/search/indexing.html#filtering-on-index-relatedfields
-
     objects = EventQuerySet.as_manager()
 
     submitter = models.ForeignKey(
@@ -782,8 +781,6 @@ class Job(ModeratedContent, ClusterableModel):
     tags = ClusterTaggableManager(through=JobTag, blank=True)
     external_url = models.URLField(blank=True)
     is_deleted = models.BooleanField(default=False)
-    # need to have this denormalized field to allow for filtering out spam content
-    # https://docs.wagtail.org/en/stable/topics/search/indexing.html#filtering-on-index-relatedfields
 
     submitter = models.ForeignKey(
         settings.AUTH_USER_MODEL,

django/library/jinja2/library/codebases/releases/edit.jinja

@@ -1,21 +1,23 @@
 {% extends "base.jinja" %}
-{% from "common.jinja" import spam_detected_alert %}
+{% from "common.jinja" import alert_if_spam %}
 
 {% block introduction %}
 <h1><i class='fas fa-cloud-upload-alt'></i> Publish your computational model</h1>
 {% endblock %}
 {% block content %}
 {% if release.codebase.is_marked_spam %}
-    {{ spam_detected_alert() }}
-{% endif %}
+    {{ alert_if_spam(true) }}
+{% else %}
 <div id="app" data-version-number="{{ release.version_number }}" data-identifier="{{ release.codebase.identifier }}"
     data-review-status-enum="{{ review_status_enum_json }}"></div>
 <div id="release-editor" data-version-number="{{ release.version_number }}"
     data-identifier="{{ release.codebase.identifier }}"
     data-review-status="{{ release.get_review().get_status_display() if release.get_review() else 'Unreviewed' }}"
     data-is-live="{{ release.live }}"
     data-can-edit-originals="{{ release.can_edit_originals }}"
-    ></div>
+    >
+</div>
+{% endif %}
 {% endblock %}
 
 {% block js %}

django/library/models.py

@@ -526,9 +526,6 @@ class Codebase(ModeratedContent, ClusterableModel):
     doi = models.CharField(max_length=128, unique=True, null=True)
     uuid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False)
 
-    # need to have this denormalized field to allow for filtering out spam content
-    # https://docs.wagtail.org/en/stable/topics/search/indexing.html#filtering-on-index-relatedfields
-
     latest_version = models.ForeignKey(
         "CodebaseRelease",
         null=True,