zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-22 18:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Simplify

Browse source
This commit is contained in:
zandercymatics 2024-05-20 10:15:53 -06:00
parent 5ed0a56d79
commit 9d576ed1cb
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/registrar/views/finish_user_setup.py
View file

@ -132,26 +132,18 @@ class FinishUserSetupView(ContactFormBaseView):
""" """
# Update redirect type based on the query parameter if present # Update redirect type based on the query parameter if present
redirect_type = request.GET.get("redirect", None) redirect_type = request.GET.get("redirect", self.RedirectType.BACK_TO_SELF)
# We set this here rather than in .get so we don't override all_redirect_types = [r.value for r in self.RedirectType]
# existing data if no queryparam is present. if redirect_type in all_redirect_types:
is_default = redirect_type is None self.redirect_type = self.RedirectType(redirect_type)
if is_default:
# Set to the default
redirect_type = self.RedirectType.BACK_TO_SELF
self.redirect_type = redirect_type
else: else:
all_redirect_types = [r.value for r in self.RedirectType] # If the redirect type is undefined, then we assume that
if redirect_type in all_redirect_types: # we are specifying a particular page to redirect to.
self.redirect_type = self.RedirectType(redirect_type) self.redirect_type = self.RedirectType.TO_SPECIFIC_PAGE
else:
# If the redirect type is undefined, then we assume that
# we are specifying a particular page to redirect to.
self.redirect_type = self.RedirectType.TO_SPECIFIC_PAGE
# Store the page that we want to redirect to for later use # Store the page that we want to redirect to for later use
request.session["redirect_viewname"] = str(redirect_type) request.session["redirect_viewname"] = str(redirect_type)
return super().dispatch(request, *args, **kwargs) return super().dispatch(request, *args, **kwargs)
@ -168,6 +160,12 @@ class FinishUserSetupView(ContactFormBaseView):
# Get the current form and validate it # Get the current form and validate it
if form.is_valid(): if form.is_valid():
completed_states = [self.RedirectType.TO_SPECIFIC_PAGE, self.RedirectType.HOME]
if self.redirect_type in completed_states:
self.request.user.finished_setup = True
self.request.user.save()
if "contact_setup_save_button" in request.POST: if "contact_setup_save_button" in request.POST:
# Logic for when the 'Save' button is clicked # Logic for when the 'Save' button is clicked
self.redirect_type = self.RedirectType.COMPLETE_SETUP self.redirect_type = self.RedirectType.COMPLETE_SETUP