Merge pull request #520 from CityOfNewYork/develop

OpenRecords v3.4.2
CityOfNewYork · Apr 2, 2020 · 949c846 · 949c846
2 parents 360c6b5 + 0a9e4a7
commit 949c846
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/app/models.py b/app/models.py
@@ -390,7 +390,7 @@ def is_authenticated(self):
 
     @property
     def is_active(self):
-        return self.email_validated and self.terms_of_use_accepted
+        return self.email_validated
 
     @property
     def is_public(self):

diff --git a/app/templates/email_templates/email_confirmation.html b/app/templates/email_templates/email_confirmation.html
@@ -12,6 +12,9 @@
                             </p>
                             <!-- Contact and Request Information -->
                             <p>
+                                {% if current_request.custom_metadata %}
+                                    Request Type: {{ current_request.description }}
+                                {% endif %}
                                 {% if file_link %}
                                     Attached File: {{ file_link['title'] }}:
                                     <a href="{{ file_link['link'] }}">{{ file_link['filename'] }}</a>

diff --git a/app/templates/email_templates/email_request_status_changed.html b/app/templates/email_templates/email_request_status_changed.html
@@ -7,6 +7,9 @@
             <li>
                 <a href="{{ request.url }}">{{ request.id }}</a>
                 <ul>
+                    {% if request.custom_metadata %}
+                        <li>Request Type: {{ request.description }}</li>
+                    {% endif %}
                     <li>Requester Last Name: {{ request.requester.last_name }}</li>
                     <li>Request Opened: {{ request.date_submitted.strftime('%m/%d/%y') }}</li>
                 </ul>
@@ -23,6 +26,9 @@
                 <li>
                     <a href="{{ request.url }}">{{ request.id }}</a>
                     <ul>
+                        {% if request.custom_metadata %}
+                            <li>Request Type: {{ request.description }}</li>
+                        {% endif %}
                         <li>Requester Last Name: {{ request.requester.last_name }}</li>
                         <li>Request Opened: {{ request.date_submitted.strftime('%m/%d/%y') }}</li>
                     </ul>
@@ -46,6 +52,9 @@
                     {% endif %}
                 </strong>
                 <ul>
+                    {% if request.custom_metadata %}
+                        <li>Request Type: {{ request.description }}</li>
+                    {% endif %}
                     <li>Requester Last Name: {{ request.requester.last_name }}</li>
                     <li>Request Opened: {{ request.date_submitted.strftime('%m/%d/%y') }}</li>
                 </ul>
@@ -69,6 +78,9 @@
                         {% endif %}
                     </strong>
                     <ul>
+                        {% if request.custom_metadata %}
+                            <li>Request Type: {{ request.description }}</li>
+                        {% endif %}
                         <li>Requester Last Name: {{ request.requester.last_name }}</li>
                         <li>Request Opened: {{ request.date_submitted.strftime('%m/%d/%y') }}</li>
                     </ul>