Fix merge conflict

This commit is contained in:
Rebecca Hsieh 2024-05-28 12:46:41 -07:00
parent 9f2a9594f6
commit 54c5052b2b
No known key found for this signature in database

View file

@ -22,6 +22,8 @@ from .utility import (
DomainRequestWizardPermissionView, DomainRequestWizardPermissionView,
) )
from waffle.decorators import flag_is_active
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -376,8 +378,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
def get_context_data(self): def get_context_data(self):
"""Define context for access on all wizard pages.""" """Define context for access on all wizard pages."""
# Build the submit button that we'll pass to the modal.
# Concatenate the modal header that we'll pass to the modal.
context_stuff = {} context_stuff = {}
if DomainRequest._form_complete(self.domain_request): if DomainRequest._form_complete(self.domain_request):
@ -393,6 +393,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
"modal_description": "Once you submit this request, you wont be able to edit it until we review it.\ "modal_description": "Once you submit this request, you wont be able to edit it until we review it.\
Youll only be able to withdraw your request.", Youll only be able to withdraw your request.",
"review_form_is_complete": True, "review_form_is_complete": True,
"has_profile_feature_flag": flag_is_active(self.request, "profile_feature"),
} }
else: # form is not complete else: # form is not complete
modal_button = '<button type="button" ' 'class="usa-button" ' " data-close-modal>Return to request</button>" modal_button = '<button type="button" ' 'class="usa-button" ' " data-close-modal>Return to request</button>"
@ -406,6 +407,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
"modal_description": "You cant submit this request because its incomplete.\ "modal_description": "You cant submit this request because its incomplete.\
Click return to request and complete the sections that are missing information.", Click return to request and complete the sections that are missing information.",
"review_form_is_complete": False, "review_form_is_complete": False,
"has_profile_feature_flag": flag_is_active(self.request, "profile_feature"),
} }
return context_stuff return context_stuff