zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-15 05:54:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update domain_request.py

Browse source
This commit is contained in:
zandercymatics 2024-10-31 15:42:39 -06:00
parent 37894e7ede
commit 20a5774213
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/registrar/views/domain_request.py
View file

@ -158,6 +158,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
# Configure titles, wizard_conditions, unlocking_steps, and steps # Configure titles, wizard_conditions, unlocking_steps, and steps
self.configure_step_options() self.configure_step_options()
self._domain_request = None # for caching self._domain_request = None # for caching
self.domain_request_id = None
def configure_step_options(self): def configure_step_options(self):
"""Changes which steps are available to the user based on self.is_portfolio. """Changes which steps are available to the user based on self.is_portfolio.
@ -182,7 +183,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
def has_pk(self): def has_pk(self):
"""Does this wizard know about a DomainRequest database record?""" """Does this wizard know about a DomainRequest database record?"""
return "domain_request_id" in self.storage
return self.kwargs.get("id") is not None
def get_step_enum(self): def get_step_enum(self):
"""Determines which step enum we should use for the wizard""" """Determines which step enum we should use for the wizard"""
@ -214,11 +216,10 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
raise ValueError("Invalid value for User") raise ValueError("Invalid value for User")
if self.has_pk(): if self.has_pk():
id = self.storage["domain_request_id"]
try: try:
self._domain_request = DomainRequest.objects.get( self._domain_request = DomainRequest.objects.get(
creator=creator, creator=creator,
pk=id, pk=self.kwargs.get('id'),
) )
return self._domain_request return self._domain_request
except DomainRequest.DoesNotExist: except DomainRequest.DoesNotExist:
@ -239,7 +240,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
else: else:
self._domain_request = DomainRequest.objects.create(creator=self.request.user) self._domain_request = DomainRequest.objects.create(creator=self.request.user)
self.storage["domain_request_id"] = self._domain_request.id self.kwargs["id"] = self._domain_request.id
return self._domain_request return self._domain_request
@property @property
@ -295,6 +296,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
"""This method handles GET requests.""" """This method handles GET requests."""
self.kwargs = kwargs
if not self.is_portfolio and self.request.user.is_org_user(request): if not self.is_portfolio and self.request.user.is_org_user(request):
self.is_portfolio = True self.is_portfolio = True
# Configure titles, wizard_conditions, unlocking_steps, and steps # Configure titles, wizard_conditions, unlocking_steps, and steps
@ -307,9 +309,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
# and remove any prior wizard data from their session # and remove any prior wizard data from their session
if current_url == self.EDIT_URL_NAME and "id" in kwargs: if current_url == self.EDIT_URL_NAME and "id" in kwargs:
del self.storage del self.storage
self.storage["domain_request_id"] = kwargs["id"]
elif "id" not in kwargs:
del self.storage
# if accessing this class directly, redirect to either to an acknowledgement # if accessing this class directly, redirect to either to an acknowledgement
# page or to the first step in the processes (if an edit rather than a new request); # page or to the first step in the processes (if an edit rather than a new request);
@ -317,7 +316,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
# send users "to the domain request wizard" without needing to know which view # send users "to the domain request wizard" without needing to know which view
# is first in the list of steps. # is first in the list of steps.
if self.__class__ == DomainRequestWizard: if self.__class__ == DomainRequestWizard:
print(F"what is this? {request.path_info}")
if request.path_info == self.NEW_URL_NAME: if request.path_info == self.NEW_URL_NAME:
# Clear context so the prop getter won't create a request here. # Clear context so the prop getter won't create a request here.
# Creating a request will be handled in the post method for the # Creating a request will be handled in the post method for the