mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-18 18:39:21 +02:00
Fix merge conflict
This commit is contained in:
parent
9f2a9594f6
commit
54c5052b2b
1 changed files with 4 additions and 2 deletions
|
@ -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 won’t be able to edit it until we review it.\
|
"modal_description": "Once you submit this request, you won’t be able to edit it until we review it.\
|
||||||
You’ll only be able to withdraw your request.",
|
You’ll 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 can’t submit this request because it’s incomplete.\
|
"modal_description": "You can’t submit this request because it’s 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
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue