Merge pull request #4244 from GSA-TTS/main

backend/audit/models/models.py

@@ -13,7 +13,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.utils import timezone as django_timezone
 
-from django_fsm import FSMField, RETURN_VALUE, transition
+from django_fsm import FSMField, transition
 
 import audit.cross_validation
 from audit.cross_validation.naming import SECTION_NAMES
@@ -505,23 +505,15 @@ def validate_individually(self):
     @transition(
         field="submission_status",
         source=STATUS.IN_PROGRESS,
-        target=RETURN_VALUE(STATUS.IN_PROGRESS, STATUS.READY_FOR_CERTIFICATION),
+        target=STATUS.READY_FOR_CERTIFICATION,
     )
     def transition_to_ready_for_certification(self):
         """
-        Pretend we're doing multi-sheet validation here.
-        This probably won't be the first time this validation is done;
-        there's likely to be a step in one of the views that does cross-sheet
-        validation and reports back to the user.
+        The permission checks verifying that the user attempting to do this has
+        the appropriate privileges will be done at the view level.
         """
-        errors = self.validate_full()
-        if not errors:
-            self.transition_name.append(
-                SingleAuditChecklist.STATUS.READY_FOR_CERTIFICATION
-            )
-            self.transition_date.append(datetime.now(timezone.utc))
-            return SingleAuditChecklist.STATUS.READY_FOR_CERTIFICATION
-        return SingleAuditChecklist.STATUS.IN_PROGRESS
+        self.transition_name.append(SingleAuditChecklist.STATUS.READY_FOR_CERTIFICATION)
+        self.transition_date.append(datetime.now(timezone.utc))
 
     @transition(
         field="submission_status",

backend/audit/views/views.py

@@ -332,11 +332,13 @@ def post(self, request, *args, **kwargs):
                     event_type=SubmissionEvent.EventType.LOCKED_FOR_CERTIFICATION,
                 )
                 return redirect(reverse("audit:SubmissionProgress", args=[report_id]))
-
-            context = {"report_id": report_id, "errors": errors}
-            return render(
-                request, "audit/cross-validation/cross-validation-results.html", context
-            )
+            else:
+                context = {"report_id": report_id, "errors": errors}
+                return render(
+                    request,
+                    "audit/cross-validation/cross-validation-results.html",
+                    context,
+                )
 
         except SingleAuditChecklist.DoesNotExist:
             raise PermissionDenied("You do not have access to this audit.")

backend/dissemination/templates/search-alert-info.html

@@ -5,20 +5,20 @@
         <h2 class="usa-alert__heading">Searching the FAC database</h2>
         {% if advanced_search_flag %}
           <p class="usa-alert__text padding-bottom-2">
-              Learn more about how our advanced search flters work on <a href='https://www.fac.gov/search-resources/advanced/' target='_blank'>our resources page</a>.
+              Learn more about how our advanced search filters work on <a href='https://www.fac.gov/search-resources/advanced/' target='_blank'>our resources page</a>.
           </p>
         {% else %}
           <p class="usa-alert__text padding-bottom-2">
-            Learn more about how our search flters work on <a href='https://www.fac.gov/search-resources/filters/' target='_blank'>our resources page</a>.
+            Learn more about how our search filters work on <a href='https://www.fac.gov/search-resources/filters/' target='_blank'>our resources page</a>.
           </p>
         {% endif %}
 
         <h2 class="usa-alert__heading">Summary reports</h2>
         <p class="usa-alert__text padding-bottom-2">
-            For search results of {{ summary_report_download_limit|intcomma }} submissions or less, you can download a combined spreadsheet of all data. 
+            For search results of {{ summary_report_download_limit|intcomma }} submissions or less, you can download a combined spreadsheet of all data.
             If you need to download more than {{ summary_report_download_limit|intcomma }} submissions, try limiting your search parameters to download in batches.
         </p>
-        
+
         {% if advanced_search_flag %}
           <h2 class="usa-alert__heading">Basic search</h2>
           <p class="usa-alert__text">