diff --git a/atst/domain/requests/requests.py b/atst/domain/requests/requests.py
index 29f3b526..2b5705a9 100644
--- a/atst/domain/requests/requests.py
+++ b/atst/domain/requests/requests.py
@@ -27,7 +27,7 @@ def create_revision_from_request_body(body):
class Requests(object):
- AUTO_APPROVE_THRESHOLD = 1_000_000
+ AUTO_ACCEPT_THRESHOLD = 1_000_000
ANNUAL_SPEND_THRESHOLD = 1_000_000
@classmethod
@@ -63,7 +63,7 @@ class Requests(object):
def submit(cls, request):
request = Requests.set_status(request, RequestStatus.SUBMITTED)
- if Requests.should_auto_approve(request):
+ if Requests.should_auto_accept(request):
request = Requests.set_status(
request, RequestStatus.PENDING_FINANCIAL_VERIFICATION
)
@@ -72,7 +72,7 @@ class Requests(object):
request=request,
review_data={
"comment": "Auto-acceptance for dollar value below {}".format(
- dollars(Requests.AUTO_APPROVE_THRESHOLD)
+ dollars(Requests.AUTO_ACCEPT_THRESHOLD)
)
},
)
@@ -134,13 +134,13 @@ class Requests(object):
return updated_request
@classmethod
- def should_auto_approve(cls, request):
+ def should_auto_accept(cls, request):
try:
dollar_value = request.body["details_of_use"]["dollar_value"]
except KeyError:
return False
- return dollar_value < cls.AUTO_APPROVE_THRESHOLD
+ return dollar_value < cls.AUTO_ACCEPT_THRESHOLD
_VALID_SUBMISSION_STATUSES = [
RequestStatus.STARTED,
diff --git a/atst/forms/new_request.py b/atst/forms/new_request.py
index c1b3e14d..554668c9 100644
--- a/atst/forms/new_request.py
+++ b/atst/forms/new_request.py
@@ -35,7 +35,7 @@ class DetailsOfUseForm(ValidatedForm):
except ValueError:
annual_spend = 0
- if annual_spend > Requests.AUTO_APPROVE_THRESHOLD:
+ if annual_spend > Requests.ANNUAL_SPEND_THRESHOLD:
self.number_user_sessions.validators.append(InputRequired())
self.average_daily_traffic.validators.append(InputRequired())
diff --git a/templates/requests/approval.html b/templates/requests/approval.html
index bd7c99ba..53583e97 100644
--- a/templates/requests/approval.html
+++ b/templates/requests/approval.html
@@ -101,7 +101,6 @@
- {{ review.log_name }}
{% if review.comment %}
{{ review.comment }}
@@ -163,7 +162,7 @@
{{ TextInput(
review_form.comment,
label='Approval comments or notes',
- description='Provide any comments or notes regarding the approval of this request.
This message will be shared with the person making the JEDI request..',
+ description='Provide any comments or notes regarding the approval of this request.
This message will be shared with the person making the JEDI request.',
paragraph=True,
noMaxWidth=True
) }}