Skip to content

Commit

Permalink
Merge pull request #518 from CityOfNewYork/develop
Browse files Browse the repository at this point in the history 
OpenRecords v3.4.1
  • Loading branch information
@joelbcastillo
joelbcastillo authored Mar 3, 2020
2 parents aed2a55 + 5303496 commit 360c6b5
Show file tree
Hide file tree
Showing 19 changed files with 123 additions and 227 deletions.
26 changes: 0 additions & 26 deletions app/templates/email_templates/email_confirmation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,6 @@
</p>
<!-- Contact and Request Information -->
<p>
Request Title: {{ current_request.title }}
<br/>
<br/>
{% if (custom_request_forms_enabled and description_hidden_by_default == false) or custom_request_forms_enabled == false %}
Request Description: {{ current_request.description }}
<br/>
<br/>
{% endif %}
{% if current_request.custom_metadata %}
{% for form_number,form_values in current_request.custom_metadata|dictsort %}
<u>{{ form_values['form_name'] }}</u>
<br/>
{% for field_number,field_values in form_values['form_fields']|dictsort %}
{{ field_values['field_name'] }}:
{% if field_values['field_value'] is iterable and field_values['field_value'] is not string %}
{% for value in field_values['field_value'] %}
{{ value }}{% if field_values['field_value']|length > 1 and loop.index != field_values['field_value']|length %}, {% endif %}
{% endfor %}
{% else %}
{{ field_values['field_value'] }}
{% endif %}
<br/>
{% endfor %}
<br/>
{% endfor %}
{% endif %}
{% if file_link %}
Attached File: {{ file_link['title'] }}:
<a href="{{ file_link['link'] }}">{{ file_link['filename'] }}</a>
Expand Down
6 changes: 0 additions & 6 deletions app/templates/email_templates/email_not_onboarded.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
</p>
<!-- Contact and Request Information -->
<p>
Request Title: {{ current_request.title }}
<br/>
<br/>
Request Description: {{ current_request.description }}
<br/>
<br/>
{% if file_link %}
Attached File: {{ file_link['title'] }}:
<a href="{{ file_link['link'] }}">{{ file_link['filename'] }}</a>
Expand Down
29 changes: 0 additions & 29 deletions app/templates/email_templates/email_request_info.html
View file

This file was deleted.

92 changes: 0 additions & 92 deletions app/templates/email_templates/email_request_status_changed.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,6 @@
<li>
<a href="{{ request.url }}">{{ request.id }}</a>
<ul>
<li>Request Title: {{ request.title }}</li>
<li>Request Description: {{ request.description }}</li>
{% if request.custom_metadata %}
{% for form_number,form_values in request.custom_metadata|dictsort %}
<li>
<u>{{ form_values['form_name'] }}</u>
<br/>
{% for field_number,field_values in form_values['form_fields']|dictsort %}
{{ field_values['field_name'] }}:
{% if field_values['field_value'] is iterable and field_values['field_value'] is not string %}
{% for value in field_values['field_value'] %}
{{ value }}
{% if field_values['field_value']|length > 1 and loop.index != field_values['field_value']|length %}
, {% endif %}
{% endfor %}
{% else %}
{{ field_values['field_value'] }}
{% endif %}
<br/>
{% endfor %}
</li>
{% endfor %}
{% endif %}
<li>Requester Last Name: {{ request.requester.last_name }}</li>
<li>Request Opened: {{ request.date_submitted.strftime('%m/%d/%y') }}</li>
</ul>
Expand All @@ -46,29 +23,6 @@
<li>
<a href="{{ request.url }}">{{ request.id }}</a>
<ul>
<li>Request Title: {{ request.title }}</li>
<li>Request Description: {{ request.description }}</li>
{% if request.custom_metadata %}
{% for form_number,form_values in request.custom_metadata|dictsort %}
<li>
<u>{{ form_values['form_name'] }}</u>
<br/>
{% for field_number,field_values in form_values['form_fields']|dictsort %}
{{ field_values['field_name'] }}:
{% if field_values['field_value'] is iterable and field_values['field_value'] is not string %}
{% for value in field_values['field_value'] %}
{{ value }}
{% if field_values['field_value']|length > 1 and loop.index != field_values['field_value']|length %}
, {% endif %}
{% endfor %}
{% else %}
{{ field_values['field_value'] }}
{% endif %}
<br/>
{% endfor %}
</li>
{% endfor %}
{% endif %}
<li>Requester Last Name: {{ request.requester.last_name }}</li>
<li>Request Opened: {{ request.date_submitted.strftime('%m/%d/%y') }}</li>
</ul>
Expand All @@ -92,29 +46,6 @@
{% endif %}
</strong>
<ul>
<li>Request Title: {{ request.title }}</li>
<li>Request Description: {{ request.description }}</li>
{% if request.custom_metadata %}
{% for form_number,form_values in request.custom_metadata|dictsort %}
<li>
<u>{{ form_values['form_name'] }}</u>
<br/>
{% for field_number,field_values in form_values['form_fields']|dictsort %}
{{ field_values['field_name'] }}:
{% if field_values['field_value'] is iterable and field_values['field_value'] is not string %}
{% for value in field_values['field_value'] %}
{{ value }}
{% if field_values['field_value']|length > 1 and loop.index != field_values['field_value']|length %}
, {% endif %}
{% endfor %}
{% else %}
{{ field_values['field_value'] }}
{% endif %}
<br/>
{% endfor %}
</li>
{% endfor %}
{% endif %}
<li>Requester Last Name: {{ request.requester.last_name }}</li>
<li>Request Opened: {{ request.date_submitted.strftime('%m/%d/%y') }}</li>
</ul>
Expand All @@ -138,29 +69,6 @@
{% endif %}
</strong>
<ul>
<li>Request Title: {{ request.title }}</li>
<li>Request Description: {{ request.description }}</li>
{% if request.custom_metadata %}
{% for form_number,form_values in request.custom_metadata|dictsort %}
<li>
<u>{{ form_values['form_name'] }}</u>
<br/>
{% for field_number,field_values in form_values['form_fields']|dictsort %}
{{ field_values['field_name'] }}:
{% if field_values['field_value'] is iterable and field_values['field_value'] is not string %}
{% for value in field_values['field_value'] %}
{{ value }}
{% if field_values['field_value']|length > 1 and loop.index != field_values['field_value']|length %}
, {% endif %}
{% endfor %}
{% else %}
{{ field_values['field_value'] }}
{% endif %}
<br/>
{% endfor %}
</li>
{% endfor %}
{% endif %}
<li>Requester Last Name: {{ request.requester.last_name }}</li>
<li>Request Opened: {{ request.date_submitted.strftime('%m/%d/%y') }}</li>
</ul>
Expand Down
1 change: 0 additions & 1 deletion app/templates/email_templates/email_response.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
{% endblock %}
{% else %}
{{ content | safe }}
{% include "email_templates/email_request_info.html" %}
{% endif %}
1 change: 0 additions & 1 deletion app/templates/email_templates/email_response_acknowledgment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@
</p>
{% else %}
{{ content | safe }}
{% include "email_templates/email_request_info.html" %}
{% endif %}
30 changes: 0 additions & 30 deletions app/templates/email_templates/email_response_closing.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,4 @@
{% endif %}
{% else %}
{{ content | safe }}
<p>
<strong>Request Information:</strong><br/>
Request Title: {{ request.title }}
</p>
{% if (custom_request_forms_enabled and description_hidden_by_default == false) or custom_request_forms_enabled == false %}
<p>
Request Description: {{ request.description }}
</p>
{% endif %}
{% if request.custom_metadata %}
{% for form_number,form_values in request.custom_metadata|dictsort %}
<u>{{ form_values['form_name'] }}</u>
<br/>
{% for field_number,field_values in form_values['form_fields']|dictsort %}
{{ field_values['field_name'] }}:
{% if field_values['field_value'] is iterable and field_values['field_value'] is not string %}
{% for value in field_values['field_value'] %}
{{ value }}
{% if field_values['field_value']|length > 1 and loop.index != field_values['field_value']|length %}
, {% endif %}
{% endfor %}
{% else %}
{{ field_values['field_value'] }}
{% endif %}
<br/>
{% endfor %}
<br/>
{% endfor %}
{% endif %}

{% endif %}
29 changes: 0 additions & 29 deletions app/templates/email_templates/email_response_denial.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,4 @@
</span>
{% else %}
{{ content | safe }}
<p>
<strong>Request Information:</strong><br/>
Request Title: {{ request.title }}
</p>
{% if (custom_request_forms_enabled and description_hidden_by_default == false) or custom_request_forms_enabled == false %}
<p>
Request Description: {{ request.description }}
</p>
{% endif %}
{% if request.custom_metadata %}
{% for form_number,form_values in request.custom_metadata|dictsort %}
<u>{{ form_values['form_name'] }}</u>
<br/>
{% for field_number,field_values in form_values['form_fields']|dictsort %}
{{ field_values['field_name'] }}:
{% if field_values['field_value'] is iterable and field_values['field_value'] is not string %}
{% for value in field_values['field_value'] %}
{{ value }}
{% if field_values['field_value']|length > 1 and loop.index != field_values['field_value']|length %}
, {% endif %}
{% endfor %}
{% else %}
{{ field_values['field_value'] }}
{% endif %}
<br/>
{% endfor %}
<br/>
{% endfor %}
{% endif %}
{% endif %}
1 change: 0 additions & 1 deletion app/templates/email_templates/email_response_extension.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@
</p>
{% else %}
{{ content | safe }}
{% include "email_templates/email_request_info.html" %}
{% endif %}
1 change: 0 additions & 1 deletion app/templates/email_templates/email_response_file.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,4 @@
<p><br></p>
{% else %}
{{ content | safe }}
{% include "email_templates/email_request_info.html" %}
{% endif %}
1 change: 0 additions & 1 deletion app/templates/email_templates/email_response_instruction.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,4 @@
{% endif %}
{% else %}
{{ content | safe }}
{% include "email_templates/email_request_info.html" %}
{% endif %}
1 change: 0 additions & 1 deletion app/templates/email_templates/email_response_link.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,4 @@
{% endif %}
{% else %}
{{ content | safe }}
{% include "email_templates/email_request_info.html" %}
{% endif %}
1 change: 0 additions & 1 deletion app/templates/email_templates/email_response_note.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,4 @@
{% endif %}
{% else %}
{{ content | safe }}
{% include "email_templates/email_request_info.html" %}
{% endif %}
1 change: 0 additions & 1 deletion app/templates/email_templates/email_response_quick_closing.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
<p>Please visit <a href="{{ page }}">{{ request_id }}</a> to view additional information and take any necessary action.</p>
{% else %}
{{ content | safe }}
{% include "email_templates/email_request_info.html" %}
{% endif %}
1 change: 0 additions & 1 deletion app/templates/email_templates/email_response_reopening.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@
</p>
{% else %}
{{ content | safe }}
{% include "email_templates/email_request_info.html" %}
{% endif %}
2 changes: 1 addition & 1 deletion app/templates/main/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h1 class="home-page-header">Welcome to NYC Government’s home for filing Freed
</div>
<div class="col-sm-4 well public-authorities" role="complementary">
<h2 class="public-authorities-header">
Public Authorities and Agencies not using OpenRecords
Local Public Authorities and Agencies not using OpenRecords
</h2>
<ul class="nyc-gov-links">
<li>
Expand Down
Loading

0 comments on commit 360c6b5

Please sign in to comment.