Fixed logic for Additional Details section (bonus bug fix). Also linted

src/registrar/models/domain_information.py

@@ -296,23 +296,29 @@ class DomainInformation(TimeStampedModel):
         """Some yes/no forms use a db field to track whether it was checked or not.
         We handle that here for def save().
         """
+        # Check if the firstname or lastname of cisa representative has any data.
+        # Then set the has_cisa_representative flag accordingly (so that it isn't
+        # "none", which indicates an incomplete form).
         # This ensures that if we have prefilled data, the form is prepopulated
         if self.cisa_representative_first_name is not None or self.cisa_representative_last_name is not None:
             self.has_cisa_representative = (
                 self.cisa_representative_first_name != "" and self.cisa_representative_last_name != ""
             )
 
-        # This check is required to ensure that the form doesn't start out checked
+        # Check for blank data and update has_cisa_representative accordingly (if it isn't None)
         if self.has_cisa_representative is not None:
             self.has_cisa_representative = (
                 self.cisa_representative_first_name != "" and self.cisa_representative_first_name is not None
             ) and (self.cisa_representative_last_name != "" and self.cisa_representative_last_name is not None)
 
+        # Check if anything_else has any data.
+        # Then set the has_anything_else_text flag accordingly (so that it isn't
+        # "none", which indicates an incomplete form).
         # This ensures that if we have prefilled data, the form is prepopulated
         if self.anything_else is not None:
             self.has_anything_else_text = self.anything_else != ""
 
-        # This check is required to ensure that the form doesn't start out checked.
+        # Check for blank data and update has_anything_else_text accordingly (if it isn't None)
         if self.has_anything_else_text is not None:
             self.has_anything_else_text = self.anything_else != "" and self.anything_else is not None
 

src/registrar/models/domain_request.py

@@ -645,23 +645,29 @@ class DomainRequest(TimeStampedModel):
         """Some yes/no forms use a db field to track whether it was checked or not.
         We handle that here for def save().
         """
+        # Check if the firstname or lastname of cisa representative has any data.
+        # Then set the has_cisa_representative flag accordingly (so that it isn't
+        # "none", which indicates an incomplete form).
         # This ensures that if we have prefilled data, the form is prepopulated
         if self.cisa_representative_first_name is not None or self.cisa_representative_last_name is not None:
             self.has_cisa_representative = (
                 self.cisa_representative_first_name != "" and self.cisa_representative_last_name != ""
             )
 
-        # This check is required to ensure that the form doesn't start out checked
+        # Check for blank data and update has_cisa_representative accordingly (if it isn't None)
         if self.has_cisa_representative is not None:
             self.has_cisa_representative = (
                 self.cisa_representative_first_name != "" and self.cisa_representative_first_name is not None
             ) and (self.cisa_representative_last_name != "" and self.cisa_representative_last_name is not None)
 
+        # Check if anything_else has any data.
+        # Then set the has_anything_else_text flag accordingly (so that it isn't
+        # "none", which indicates an incomplete form).
         # This ensures that if we have prefilled data, the form is prepopulated
         if self.anything_else is not None:
             self.has_anything_else_text = self.anything_else != ""
 
-        # This check is required to ensure that the form doesn't start out checked.
+        # Check for blank data and update has_anything_else_text accordingly (if it isn't None)
         if self.has_anything_else_text is not None:
             self.has_anything_else_text = self.anything_else != "" and self.anything_else is not None
 

src/registrar/views/domain_request.py

@@ -369,7 +369,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 or self.domain_request.zipcode is not None
                 or self.domain_request.urbanization is not None
             ),
-            "about_your_organization": True,
+            "about_your_organization": self.domain_request.about_your_organization is not None,
             "senior_official": self.domain_request.senior_official is not None,
             "current_sites": (
                 self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
@@ -382,7 +382,11 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 or self.domain_request.no_other_contacts_rationale is not None
             ),
             "additional_details": (
-                (self.domain_request.has_anything_else_text and self.domain_request.has_cisa_representative)
+                # Additional details is complete as long as "has anything else" and "has cisa rep" are not None
+                (
+                    self.domain_request.has_anything_else_text is not None
+                    and self.domain_request.has_cisa_representative is not None
+                )
             ),
             "requirements": self.domain_request.is_policy_acknowledged is not None,
             "review": self.domain_request.is_policy_acknowledged is not None,