diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py index d401360b8..e0aa04483 100644 --- a/src/registrar/forms/domain_request_wizard.py +++ b/src/registrar/forms/domain_request_wizard.py @@ -83,7 +83,6 @@ class RequestingEntityForm(RegistrarForm): # Remove the custom other field before cleaning data = self.data.copy() if self.data else None suborganization = self.data.get('portfolio_requesting_entity-sub_organization') - is_suborganization = self.data.get("portfolio_requesting_entity-is_suborganization") if suborganization: if "other" in data['portfolio_requesting_entity-sub_organization']: # Remove the 'other' value diff --git a/src/registrar/forms/utility/wizard_form_helper.py b/src/registrar/forms/utility/wizard_form_helper.py index 0a1019aae..eedf5839b 100644 --- a/src/registrar/forms/utility/wizard_form_helper.py +++ b/src/registrar/forms/utility/wizard_form_helper.py @@ -261,7 +261,6 @@ class BaseYesNoForm(RegistrarForm): "required": self.required_error_message, }, ) - print(f"here are the form choices: {self.form_choices}, here is the initial: {self.get_initial_value()}") return choice_field diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index e9ba3d7bf..9c990ebd4 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -1208,6 +1208,7 @@ class DomainRequest(TimeStampedModel): if self.has_information_required_to_make_suborganization(): return True + return False def is_custom_suborganization(self) -> bool: @@ -1219,11 +1220,10 @@ class DomainRequest(TimeStampedModel): def has_information_required_to_make_suborganization(self): """Checks if we have all the information we need to create a new suborganization object. Checks for a the existence of requested_suborganization, suborganization_city, suborganization_state_territory""" - return ( - self.requested_domain and - self.suborganization_city and - self.suborganization_state_territory - ) + if self.requested_suborganization and self.suborganization_city and self.suborganization_state_territory: + return True + else: + return False def to_dict(self): """This is to process to_dict for Domain Information, making it friendly