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

cleanup

Browse source
This commit is contained in:
Rachid Mrad 2024-06-14 13:53:33 -04:00
parent 7a666c536f
commit dbd418dc48
No known key found for this signature in database
4 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/forms/user_profile.py
View file

@ -47,7 +47,7 @@ class UserProfileForm(forms.ModelForm):
self.fields["middle_name"].label = "Middle name (optional)" self.fields["middle_name"].label = "Middle name (optional)"
self.fields["last_name"].label = "Last name / family name" self.fields["last_name"].label = "Last name / family name"
self.fields["title"].label = "Title or role in your organization" self.fields["title"].label = "Title or role in your organization"
self.fields["email"].label = "Organizational email" self.fields["email"].label = "Organization email"
# Set custom error messages # Set custom error messages
self.fields["first_name"].error_messages = {"required": "Enter your first name / given name."} self.fields["first_name"].error_messages = {"required": "Enter your first name / given name."}

7
src/registrar/registrar_middleware.py
View file

@ -68,11 +68,10 @@ class CheckUserProfileMiddleware:
return None return None
if request.user.is_authenticated: if request.user.is_authenticated:
if request.user.verification_type == User.VerificationTypeChoices.REGULAR: if hasattr(request.user, "finished_setup") and not request.user.finished_setup:
if hasattr(request.user, "finished_setup") and not request.user.finished_setup: if request.user.verification_type == User.VerificationTypeChoices.REGULAR:
return self._handle_regular_user_setup_not_finished(request) return self._handle_regular_user_setup_not_finished(request)
else: else:
if hasattr(request.user, "finished_setup") and not request.user.finished_setup:
return self._handle_other_user_setup_not_finished(request) return self._handle_other_user_setup_not_finished(request)
# Continue processing the view # Continue processing the view

12
src/registrar/templates/profile.html
View file

@ -49,7 +49,7 @@ Edit your User Profile |
data-open-modal data-open-modal
>Open confirmation modal</a> >Open confirmation modal</a>
<div <div
class="usa-modal is-visible" class="usa-modal usa-modal--lg is-visible"
id="toggle-confirmation-modal" id="toggle-confirmation-modal"
aria-labelledby="Add contact information" aria-labelledby="Add contact information"
aria-describedby="Add contact information" aria-describedby="Add contact information"
@ -79,6 +79,16 @@ Edit your User Profile |
</ul> </ul>
</div> </div>
</div> </div>
<button
type="button"
class="usa-button usa-modal__close"
aria-label="Close this window"
data-close-modal
>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="{%static 'img/sprite.svg'%}#close"></use>
</svg>
</button>
</div> </div>
</div> </div>
{% endif %} {% endif %}

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

@ -15,6 +15,7 @@ from django.urls import NoReverseMatch, reverse
from registrar.models import ( from registrar.models import (
Contact, Contact,
) )
from registrar.models.user import User
from registrar.models.utility.generic_helper import replace_url_queryparams from registrar.models.utility.generic_helper import replace_url_queryparams
from registrar.views.utility.permission_views import UserProfilePermissionView from registrar.views.utility.permission_views import UserProfilePermissionView
from waffle.decorators import flag_is_active, waffle_flag from waffle.decorators import flag_is_active, waffle_flag
@ -41,7 +42,11 @@ class UserProfileView(UserProfilePermissionView, FormMixin):
form = self.form_class(instance=self.object) form = self.form_class(instance=self.object)
context = self.get_context_data(object=self.object, form=form) context = self.get_context_data(object=self.object, form=form)
if hasattr(self.user, "finished_setup") and not self.user.finished_setup: if (
hasattr(self.user, "finished_setup")
and not self.user.finished_setup
and self.user.verification_type != User.VerificationTypeChoices.REGULAR
):
context["show_confirmation_modal"] = True context["show_confirmation_modal"] = True
return_to_request = request.GET.get("return_to_request") return_to_request = request.GET.get("return_to_request")