Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated file email langauge #583

Merged
merged 3 commits into from
Aug 12, 2024
Merged

Updated file email langauge #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81b9723
Updated file email langauge
johnyu95 Jul 25, 2024
bc7c233
Updated language for NYPD custom reasons
johnyu95 Aug 1, 2024
2e34633
Updated styling for closing email template
johnyu95 Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/response/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2459,7 +2459,7 @@ def send_file_email(request_id, release_public_links, release_private_links, pri
).options(
joinedload(Requests.agency)
).filter_by(id=request_id).one()
subject = 'Response Added to {} - File'.format(request_id)
subject = 'Response Added to {} - Record'.format(request_id)
bcc = get_assigned_users_emails(request_id)
if release_public_links or release_private_links:
release_date = get_release_date(datetime.utcnow(), RELEASE_PUBLIC_DAYS, tz_name).strftime("%A, %B %d, %Y")
Expand All @@ -2472,7 +2472,7 @@ def send_file_email(request_id, release_public_links, release_private_links, pri
))
safely_send_and_add_email(request_id,
email_content_requester,
'Response Added to {} - File'.format(request_id),
'Response Added to {} - Record'.format(request_id),
to=[request.requester.email],
bcc=bcc,
reply_to=request.agency.default_email)
Expand All @@ -2485,7 +2485,7 @@ def send_file_email(request_id, release_public_links, release_private_links, pri
page=page)
safely_send_and_add_email(request_id,
email_content_agency,
'File(s) Added to {}'.format(request_id),
'Record(s) Added to {}'.format(request_id),
bcc=bcc)
elif private_links:
email_content_agency = email_content.replace(replace_string,
Expand Down
4 changes: 2 additions & 2 deletions app/templates/email_templates/edit_response_file_links.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if not agency and response_data.response.request.requester.is_anonymous_requester %}
<p>
Link to file: <a href="{{ response_data.file_link_for_user['requester'] }}">
Link to record: <a href="{{ response_data.file_link_for_user['requester'] }}">
{% if response_data.data_new['name'] %}
{{ response_data.data_new['name'] }}
{% else %}
Expand All @@ -12,7 +12,7 @@

{% if agency or not response_data.response.request.requester.is_anonymous_requester %}
<p>
Link to file: <a href="{{ response_data.file_link_for_user['agency'] }}">
Link to record: <a href="{{ response_data.file_link_for_user['agency'] }}">
{% if response_data.data_new['name'] %}
{{ response_data.data_new['name'] }}
{% else %}
Expand Down
14 changes: 7 additions & 7 deletions app/templates/email_templates/email_edit_file.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
{% if response_data.data_old['privacy'] != response_privacy.PRIVATE %}
<p>
<span class="mceNonEditable">
A file in request <a href="{{ page }}">{{ request_id }}</a> has been edited.
A record in request <a href="{{ page }}">{{ request_id }}</a> has been edited.
</span>
</p>
{% else %}
<p>
<span class="mceNonEditable">
A file in request <a href="{{ page }}">{{ request_id }}</a> is available for you to view.
A record in request <a href="{{ page }}">{{ request_id }}</a> is available for you to view.
</span>
</p>
<div class="file-links">
{% if response_data.response.request.requester.is_anonymous_requester %}
<p>
<span class="mceNonEditable">
Link to file: <a href="{{ response_data.file_link_for_user['requester'] }}">
Link to record: <a href="{{ response_data.file_link_for_user['requester'] }}">
{% if response_data.data_new['name'] %}
{{ response_data.data_new['name'] }}
{% else %}
Expand All @@ -37,7 +37,7 @@
{% if response_data.data_old['name'] %}
<p>
<span class="mceNonEditable">
The <strong>file</strong>:
The <strong>record</strong>:
</span>
</p>
<p style="padding-left: 30px;">
Expand All @@ -62,7 +62,7 @@
{% if response_data.data_old['name'] %}
<p>
<span class="mceNonEditable">
The file's <strong>name</strong> was changed from:
The record's <strong>name</strong> was changed from:
</span>
</p>
<p style="padding-left: 30px;">
Expand Down Expand Up @@ -121,7 +121,7 @@
{% if not agency and response_data.response.request.requester.is_anonymous_requester %}
<p>
<span class="mceNonEditable">
Link to file: <a href="{{ response_data.file_link_for_user['requester'] }}">
Link to record: <a href="{{ response_data.file_link_for_user['requester'] }}">
{% if response_data.data_new['name'] %}
{{ response_data.data_new['name'] }}
{% else %}
Expand All @@ -135,7 +135,7 @@
{% if agency or not response_data.response.request.requester.is_anonymous_requester %}
<p>
<span class="mceNonEditable">
Link to file: <a href="{{ response_data.file_link_for_user['agency'] }}">
Link to record: <a href="{{ response_data.file_link_for_user['agency'] }}">
{% if response_data.data_new['name'] %}
{{ response_data.data_new['name'] }}
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/email_templates/email_private_file_upload.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</p>
<p>
<span class="mceNonEditable">
The following file(s) were added to <a href='{{ page }}'>{{ request_id }}</a> and are private:
The following record(s) were added to <a href='{{ page }}'>{{ request_id }}</a> and are private:
</span>
</p>
<div class="file-links">
Expand Down
2 changes: 2 additions & 0 deletions app/templates/email_templates/email_response_closing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
href="mailto:{{ agency_appeals_email }}?subject={{ request.id }}%20-%20Appeal">{{ agency_appeals_email }}</a>
within 30 days.
</span>
<br><br>
{% endif %}
<span class="mceNonEditable"><strong>Please check your email inbox's spam folder to ensure you received all records provided by the agency.</strong></span>
{% else %}
{{ content | safe }}
{% endif %}
10 changes: 5 additions & 5 deletions app/templates/email_templates/email_response_file.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{% if default_content %}
<p>
The {{ agency_name }} has responded to your FOIL request <a href='{{ page }}'>{{ request_id }}</a> with
the following file(s).
the following record(s).
</p>

{% if public_requester %}
<p>
<span class="mceNonEditable">
<strong>NOTE</strong>: You must be logged in to your OpenRecords account to access the file(s).
<strong>NOTE</strong>: You must be logged in to your OpenRecords account to access the record(s).
If you are not logged in, you will be prompted to do so when the link is selected.
</span>
</p>
{% endif %}

{% if release_public_links %}
<p>
<span class="mceNonEditable">The file(s) listed below will be accessible to the public on the OpenRecords portal in 20 business days
<span class="mceNonEditable">The record(s) listed below will be accessible to the public on the OpenRecords portal in 20 business days
({{ moment(release_date).format('dddd, MMMM D, YYYY') }}).</span>
</p>
<div class="file-links">
Expand All @@ -29,7 +29,7 @@
{% if release_private_links %}
<p>
<span class="mceNonEditable">
The file(s) listed below will not be publicly available on the OpenRecords portal.
The record(s) listed below will not be publicly available on the OpenRecords portal.
</span>
</p>
<ul>
Expand All @@ -46,7 +46,7 @@
{% if release_private_links and not release_public_links %}
<p>
<span class="mceNonEditable">
The file(s) listed below will not be publicly available on the OpenRecords portal.
The record(s) listed below will not be publicly available on the OpenRecords portal.
</span>
</p>
<div class="file-links">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/email_templates/response_file_links.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</ul>
{% if release_private_links %}
<p>
The file(s) listed below will not be publicly available on the OpenRecords portal.
The record(s) listed below will not be publicly available on the OpenRecords portal.
</p>
<ul>
{% for file in release_private_links %}
Expand Down
8 changes: 4 additions & 4 deletions app/templates/request/events/modal_body/file_edited.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
<ul>
{% if event.new_value.get('name') %}
<li>
The file "{{ event.previous_value['name'] }}" was changed to
The record "{{ event.previous_value['name'] }}" was changed to
"{{ event.new_value['name'] }}".
</li>
{% elif event.new_value.get('hash') %}
<li>
The <strong>content</strong> of the file "{{ event.response.name }}" was changed.
The <strong>content</strong> of the record "{{ event.response.name }}" was changed.
</li>
{% endif %}

{% if event.new_value.get('title') %}
<li>
The file response <strong>title</strong> was changed from "{{ event.previous_value['title'] }}" to
The record response <strong>title</strong> was changed from "{{ event.previous_value['title'] }}" to
"{{ event.new_value['title'] }}".
</li>
{% endif %}

{% if event.new_value.get('privacy') %}
<li>
The file response <strong>privacy</strong> was changed from
The record response <strong>privacy</strong> was changed from
{% include "request/events/modal_body/base/privacy_change.html" %}
</li>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion data/reasons.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"closing","Closed - Fulfilled via Walk In","Your request under the Freedom of Information Law (FOIL) has been fulfilled via walk in.","0056","True"
"closing","Closed - CIS Case","Because you and/or your client have demonstrated that you have an interest in the subject accident, §66-a of the Public Officers Law, rather than FOIL, governs the extent of disclosure that is available to you, and affords you greater access than could be obtained under FOIL.","0056","True"
"closing","Closed - CIS Case (Redacted)","Because you and/or your client have demonstrated that you have an interest in the subject accident, §66-a of the Public Officers Law, rather than FOIL, governs the extent of disclosure that is available to you, and affords you greater access than could be obtained under FOIL. Please note that if the case folder contained records that did not directly pertain to the accident, such records are not included in the provided document(s).","0056","True"
"closing","Closed - Requested Documents Provided","The requested documents were previously sent to you via email.","0056","True"
"closing","Closed - Requested Documents Provided","The requested documents were sent to you via email.","0056","True"
"closing","Closed - Document List","Responsive to your request, the following document(s) have been accessed:<p class=""mceEditable""></p>","0056","True"
"closing","Closed - Personal Privacy - Redacted","Redactions have been made to the document(s) in that release of information would represent an unwarranted invasion of personal privacy {§ 87.2 (b)}.","0056","True"
"closing","Closed - Endanger - Redacted","Redactions have been made to the document(s) in that release of information would endanger the life and safety of any person {§ 87.2 (f)}.","0056","True"
Expand Down