mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-17 18:09:25 +02:00
Merge remote-tracking branch 'origin/main' into ms/2307-send-notification-emails
This commit is contained in:
commit
ac02e8cb81
116 changed files with 4493 additions and 1663 deletions
|
@ -327,7 +327,6 @@ class DomainRequest(TimeStampedModel):
|
|||
null=True,
|
||||
blank=True,
|
||||
related_name="DomainRequest_portfolio",
|
||||
help_text="Portfolio associated with this domain request",
|
||||
)
|
||||
|
||||
sub_organization = models.ForeignKey(
|
||||
|
@ -336,7 +335,8 @@ class DomainRequest(TimeStampedModel):
|
|||
null=True,
|
||||
blank=True,
|
||||
related_name="request_sub_organization",
|
||||
help_text="The suborganization that this domain request is included under",
|
||||
help_text="If blank, request is associated with the overarching organization for this portfolio.",
|
||||
verbose_name="Suborganization",
|
||||
)
|
||||
|
||||
# This is the domain request user who created this domain request.
|
||||
|
@ -583,6 +583,10 @@ class DomainRequest(TimeStampedModel):
|
|||
blank=True,
|
||||
)
|
||||
|
||||
def is_awaiting_review(self) -> bool:
|
||||
"""Checks if the current status is in submitted or in_review"""
|
||||
return self.status in [self.DomainRequestStatus.SUBMITTED, self.DomainRequestStatus.IN_REVIEW]
|
||||
|
||||
def get_first_status_set_date(self, status):
|
||||
"""Returns the date when the domain request was first set to the given status."""
|
||||
log_entry = (
|
||||
|
@ -999,6 +1003,17 @@ class DomainRequest(TimeStampedModel):
|
|||
send_email=send_email,
|
||||
)
|
||||
|
||||
def is_withdrawable(self):
|
||||
"""Helper function that determines if the request can be withdrawn in its current status"""
|
||||
# This list is equivalent to the source field on withdraw. We need a better way to
|
||||
# consolidate these two lists - i.e. some sort of method that keeps these two lists in sync.
|
||||
# django fsm is very picky with what we can define in that field.
|
||||
return self.status in [
|
||||
self.DomainRequestStatus.SUBMITTED,
|
||||
self.DomainRequestStatus.IN_REVIEW,
|
||||
self.DomainRequestStatus.ACTION_NEEDED,
|
||||
]
|
||||
|
||||
@transition(
|
||||
field="status",
|
||||
source=[DomainRequestStatus.SUBMITTED, DomainRequestStatus.IN_REVIEW, DomainRequestStatus.ACTION_NEEDED],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue