mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-14 05:29:43 +02:00
* Update to unlock with prior step for non-org request * Update org model unlocking for current sites * Update non-org unlocking
This commit is contained in:
parent
952b2b652a
commit
7a205e491b
2 changed files with 3 additions and 3 deletions
|
@ -1372,7 +1372,7 @@ class DomainRequest(TimeStampedModel):
|
||||||
|
|
||||||
def unlock_requesting_entity(self) -> bool:
|
def unlock_requesting_entity(self) -> bool:
|
||||||
"""Unlocks the requesting entity step. Used for the RequestingEntity page.
|
"""Unlocks the requesting entity step. Used for the RequestingEntity page.
|
||||||
Returns true if requesting_entity_is_suborganization() and requesting_entity_is_portfolio().
|
Returns true if requesting_entity_is_suborganization() or requesting_entity_is_portfolio().
|
||||||
Returns False otherwise.
|
Returns False otherwise.
|
||||||
"""
|
"""
|
||||||
if self.requesting_entity_is_suborganization() or self.requesting_entity_is_portfolio():
|
if self.requesting_entity_is_suborganization() or self.requesting_entity_is_portfolio():
|
||||||
|
|
|
@ -116,7 +116,7 @@ class DomainRequestWizard(TemplateView):
|
||||||
Step.ABOUT_YOUR_ORGANIZATION: lambda self: self.domain_request.about_your_organization is not None,
|
Step.ABOUT_YOUR_ORGANIZATION: lambda self: self.domain_request.about_your_organization is not None,
|
||||||
Step.SENIOR_OFFICIAL: lambda self: self.domain_request.senior_official is not None,
|
Step.SENIOR_OFFICIAL: lambda self: self.domain_request.senior_official is not None,
|
||||||
Step.CURRENT_SITES: lambda self: (
|
Step.CURRENT_SITES: lambda self: (
|
||||||
self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
|
self.domain_request.current_websites.exists() or self.domain_request.senior_official is not None
|
||||||
),
|
),
|
||||||
Step.DOTGOV_DOMAIN: lambda self: self.domain_request.requested_domain is not None,
|
Step.DOTGOV_DOMAIN: lambda self: self.domain_request.requested_domain is not None,
|
||||||
Step.PURPOSE: lambda self: self.domain_request.purpose is not None,
|
Step.PURPOSE: lambda self: self.domain_request.purpose is not None,
|
||||||
|
@ -135,7 +135,7 @@ class DomainRequestWizard(TemplateView):
|
||||||
PORTFOLIO_UNLOCKING_STEPS = {
|
PORTFOLIO_UNLOCKING_STEPS = {
|
||||||
PortfolioDomainRequestStep.REQUESTING_ENTITY: lambda w: w.from_model("unlock_requesting_entity", False),
|
PortfolioDomainRequestStep.REQUESTING_ENTITY: lambda w: w.from_model("unlock_requesting_entity", False),
|
||||||
PortfolioDomainRequestStep.CURRENT_SITES: lambda self: (
|
PortfolioDomainRequestStep.CURRENT_SITES: lambda self: (
|
||||||
self.domain_request.current_websites.exists() or self.domain_request.requested_domain is not None
|
self.domain_request.current_websites.exists() or self.from_model("unlock_requesting_entity", False)
|
||||||
),
|
),
|
||||||
PortfolioDomainRequestStep.DOTGOV_DOMAIN: lambda self: self.domain_request.requested_domain is not None,
|
PortfolioDomainRequestStep.DOTGOV_DOMAIN: lambda self: self.domain_request.requested_domain is not None,
|
||||||
PortfolioDomainRequestStep.PURPOSE: lambda self: self.domain_request.purpose is not None,
|
PortfolioDomainRequestStep.PURPOSE: lambda self: self.domain_request.purpose is not None,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue