zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-24 11:38:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix attempt #2

Browse source
This commit is contained in:
CocoByte 2024-07-03 18:11:26 -06:00
parent 9f4ef9f025
commit 195d3287f3
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/tests/test_views.py
View file

@ -731,7 +731,9 @@ class FinishUserProfileForOtherUsersTests(TestWithUser, WebTest):
self.assertContains(save_page, "Your profile has been updated.")
# We need to assert that logo is not clickable and links to manage your domain are not present
self.assertContains(save_page, "manage your domains", count=1)
# NOTE: "anage" is not a typo. It is to accomodate the fact that the "m" is uppercase in one
# instance and lowercase in the other.
self.assertContains(save_page, "anage your domains", count=2)
self.assertNotContains(
save_page, "Before you can manage your domains, we need you to add contact information"
)

18
src/registrar/views/user_profile.py
View file

@ -67,8 +67,7 @@ class UserProfileView(UserProfilePermissionView, FormMixin):
# Show back button conditional on user having finished setup
context["show_back_button"] = False
form = self.get_form()
if hasattr(self.user, "finished_setup") and self.user.finished_setup and form.is_valid():
if hasattr(self.user, "finished_setup") and self.user.finished_setup:
context["user_finished_setup"] = True
context["show_back_button"] = True
@ -120,7 +119,17 @@ class UserProfileView(UserProfilePermissionView, FormMixin):
# superclass has the redirect
return super().form_valid(form)
def form_invalid(self, form):
"""If the form is invalid, conditionally display an additional error."""
if hasattr(self.user, "finished_setup") and not self.user.finished_setup:
messages.error(self.request, "Before you can manage your domain, we need you to add contact information.")
logger.info("got here, now rendering response")
form.initial['redirect'] = form.data.get('redirect')
logger.info(form.initial)
return super().form_invalid(form)
def get_object(self, queryset=None):
"""Override get_object to return the logged-in user's contact"""
self.user = self.request.user # get the logged in user
if hasattr(self.user, "contact"): # Check if the user has a contact instance
@ -144,8 +153,7 @@ class FinishProfileSetupView(UserProfileView):
# Show back button conditional on user having finished setup
context["show_back_button"] = False
form = self.get_form()
if hasattr(self.user, "finished_setup") and self.user.finished_setup and form.is_valid():
if hasattr(self.user, "finished_setup") and self.user.finished_setup:
if kwargs.get("redirect") == "home":
context["show_back_button"] = True
else:
@ -182,4 +190,4 @@ class FinishProfileSetupView(UserProfileView):
return reverse(redirect_param)
except NoReverseMatch as err:
logger.error(f"get_redirect_url -> Could not find the specified page. Err: {err}")
return super().get_success_url()
return super().get_success_url()