Fix the issue with the transition email rendering

opentech/apply/activity/messaging.py

@@ -153,8 +153,8 @@ class EmailAdapter(AdapterBase):
     messages = {
         MESSAGES.NEW_SUBMISSION: 'funds/email/confirmation.html',
         MESSAGES.COMMENT: 'notify_comment',
-        MESSAGES.TRANSITION: 'funds/email/transition.html',
         MESSAGES.DETERMINATION_OUTCOME: 'funds/email/determination.html',
+        MESSAGES.TRANSITION: 'messages/email/transition.html',
     }
 
     def notify_comment(self, **kwargs):

opentech/apply/activity/templates/messages/email/base.html

@@ -4,7 +4,7 @@ Dear {{ submission.user.get_full_name|default:"applicant" }},
 
 You can access your application here: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
 
-If you have any questions, please email us at info@opentechfund.org.
+If you have any questions, please leave a message on your application or email us at info@opentechfund.org.
 
 Kind Regards,
 The OTF Team
@@ -13,5 +13,4 @@ The OTF Team
 Open Technology Fund
 https://www.opentech.fund/
 
-{% block post_signature_content %}
-{% endblock %}
+{% block post_signature_content %}{% endblock %}

opentech/apply/activity/templates/messages/email/transition.html

 {% extends "messages/email/base.html" %}
 
 {% block content %}
-Your application has been progressed from {old_phase.display_name} to {submission.phase}.
+Your application has been progressed from {{ old_phase.display_name }} to {{ submission.phase }}.
 {% endblock %}

opentech/apply/funds/views.py

@@ -38,7 +38,7 @@ class SubmissionListView(AllActivityContextMixin, SingleTableMixin, FilterView):
     filterset_class = SubmissionFilter
 
     def get_queryset(self):
-        return self.filterset_class._meta.model.objects.active().current()
+        return self.filterset_class._meta.model.objects.current()
 
     def get_context_data(self, **kwargs):
         active_filters = self.filterset.data