Skip to content

Commit 9a9fb2b

Browse files
authored
Merge pull request #2482 from GSA/main
04/03/2025 Production Deploy
2 parents b4e079d + ee8213f commit 9a9fb2b

File tree

70 files changed

+1622
-1684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1622
-1684
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
*.XLSX
1515

1616
## Non user files allowed to be commited
17+
!app/assets/pdf/best-practices-for-texting-the-public.pdf
18+
!app/assets/pdf/investing-in-notifications-tts-public-benefits-studio-decision-memo.pdf
19+
!app/assets/pdf/best-practices-section-outline.pdf
20+
!app/assets/pdf/standing-up-your-own-notify.pdf
1721
!app/assets/pdf/tcpa_overview.pdf
1822
!app/assets/pdf/investing-notifications-tts-public-benefits-memo.pdf
1923
!app/assets/pdf/out-of-pilot-announcement.pdf

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ repos:
88
- id: end-of-file-fixer
99
- id: check-yaml
1010
- id: check-added-large-files
11+
exclude: ^app/assets/pdf/.*\.pdf$
1112
- id: debug-statements
1213
- id: check-merge-conflict
1314
- id: check-toml
3.03 MB
Binary file not shown.
513 KB
Binary file not shown.
Binary file not shown.
91.3 KB
Binary file not shown.

app/formatters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ def nl2br(value):
344344
html="escape",
345345
)
346346
).then(utils_nl2br)
347-
)
347+
) # nosec
348348
return ""
349349

350350

app/main/forms.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ def govuk_text_input_field_widget(
257257

258258
return Markup(
259259
render_template("components/components/input/template.njk", params=params)
260-
)
260+
) # nosec
261261

262262

263263
class GovukTextInputField(StringField):
@@ -690,7 +690,9 @@ def govuk_checkbox_field_widget(self, field, param_extensions=None, **kwargs):
690690
if param_extensions:
691691
merge_jsonlike(params, param_extensions)
692692

693-
return Markup(render_template("forms/fields/checkboxes/macro.njk", params=params))
693+
return Markup(
694+
render_template("forms/fields/checkboxes/macro.njk", params=params)
695+
) # nosec
694696

695697

696698
def govuk_checkboxes_field_widget(
@@ -704,7 +706,7 @@ def _wrap_in_collapsible(field_label, checkboxes_string):
704706
f' data-field-label="{field_label}">'
705707
f" {checkboxes_string}"
706708
f"</div>"
707-
)
709+
) # nosec
708710

709711
return result
710712

@@ -757,12 +759,14 @@ def _wrap_in_collapsible(field_label, checkboxes_string):
757759

758760
return _wrap_in_collapsible(
759761
self.field_label,
760-
Markup(render_template("forms/fields/checkboxes/macro.njk", params=params)),
762+
Markup(
763+
render_template("forms/fields/checkboxes/macro.njk", params=params)
764+
), # nosec
761765
)
762766
else:
763767
return Markup(
764768
render_template("forms/fields/checkboxes/macro.njk", params=params)
765-
)
769+
) # nosec
766770

767771

768772
def govuk_radios_field_widget(self, field, param_extensions=None, **kwargs):
@@ -805,7 +809,7 @@ def govuk_radios_field_widget(self, field, param_extensions=None, **kwargs):
805809

806810
return Markup(
807811
render_template("components/components/radios/template.njk", params=params)
808-
)
812+
) # nosec
809813

810814

811815
class GovukCheckboxField(BooleanField):

app/main/views/invites.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def accept_invite(token):
2323
<a href={url_for("main.sign_out")} class="usa-link">Sign out</a>
2424
and click the link again to accept this invite.
2525
"""
26-
)
26+
) # nosec
2727

2828
flash(message=message)
2929

@@ -98,7 +98,7 @@ def accept_org_invite(token):
9898
""".format(
9999
current_user.email_address, url_for("main.sign_out")
100100
)
101-
)
101+
) # nosec
102102

103103
flash(message=message)
104104

app/main/views/jobs.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,31 +351,31 @@ def _get_job_counts(job):
351351
Markup(
352352
f"""total<span class="usa-sr-only">
353353
{"text message" if job_type == "sms" else job_type}s</span>"""
354-
),
354+
), # nosec
355355
"",
356356
job.notification_count,
357357
],
358358
[
359359
Markup(
360360
f"""pending<span class="usa-sr-only">
361361
{message_count_noun(job.notifications_sending, job_type)}</span>"""
362-
),
362+
), # nosec
363363
"pending",
364364
job.notifications_sending,
365365
],
366366
[
367367
Markup(
368368
f"""delivered<span class="usa-sr-only">
369369
{message_count_noun(job.notifications_delivered, job_type)}</span>"""
370-
),
370+
), # nosec
371371
"delivered",
372372
job.notifications_delivered,
373373
],
374374
[
375375
Markup(
376376
f"""failed<span class="usa-sr-only">
377377
{message_count_noun(job.notifications_failed, job_type)}</span>"""
378-
),
378+
), # nosec
379379
"failed",
380380
job.notifications_failed,
381381
],
@@ -465,4 +465,4 @@ def get_preview_of_content(notification):
465465
notification["personalisation"],
466466
redact_missing_personalisation=True,
467467
).subject
468-
)
468+
) # nosec

0 commit comments

Comments
 (0)