Add site to new incident email, order orgs, fix MR admin pane (#707)

Co-authored-by: Trevor Skaggs <[email protected]>
trevorskaggs · Apr 3, 2024 · 2474f5b · 2474f5b
1 parent b513a1f
commit 2474f5b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/incident/views.py b/incident/views.py
@@ -1,4 +1,5 @@
 from datetime import datetime
+from django.contrib.sites.models import Site
 from django.core.mail import send_mail
 from django.template.loader import render_to_string
 from rest_framework import permissions, viewsets
@@ -35,6 +36,7 @@ def perform_create(self, serializer):
                 if not inc.training:
                     emails = [user.email for user in ShelterlyUser.objects.filter(is_superuser=True)]
                     message_data = {
+                            'site': Site.objects.get_current(),
                             'user_email': self.request.user.email,
                             'organization_name': inc.organization.name,
                             'organization_slug': inc.organization.slug,
@@ -83,7 +85,7 @@ class OrganizationViewSet(viewsets.ModelViewSet):
     serializer_class = OrganizationSerializer
 
     def get_queryset(self):
-        queryset = Organization.objects.filter(id__in=self.request.user.organizations.all())
+        queryset = Organization.objects.filter(id__in=self.request.user.organizations.all()).order_by('name')
 
         if self.request.GET.get('slug'):
             queryset = queryset.filter(slug=self.request.GET.get('slug'))

diff --git a/templates/new_incident_email.html b/templates/new_incident_email.html
@@ -2,6 +2,6 @@
 <html>
 <head></head>
 <body>
-{{ user_email }} from the {{ organization_name }} has created a new incident: {{ incident_name }}. Click <h1><a href="{{ site }}/{{ organization_slug }}/{{ incident_slug }}">here</a></h1> to open the incident.
+{{ user_email }} from {{ organization_name }} has created a new incident: {{ incident_name }}. Click <h1><a href="{{ site }}/{{ organization_slug }}/{{ incident_slug }}">here</a></h1> to open the incident.
 </body>
 </html>
diff --git a/templates/new_incident_email.txt b/templates/new_incident_email.txt
@@ -1 +1 @@
-{{ user_email }} from the {{ organization_name }} has created a new incident: {{ incident_name }}. Click <h1><a href="{{ site }}/{{ organization_slug }}/{{ incident_slug }}">here</a></h1> to open the incident.
+{{ user_email }} from the {{ organization_name }} has created a new incident: {{ incident_name }}. Click <a href="{{ site }}/{{ organization_slug }}/{{ incident_slug }}">here</a> to open the incident.
diff --git a/vet/admin.py b/vet/admin.py
@@ -6,7 +6,7 @@ class ExamQuestionAdmin(admin.ModelAdmin):
   list_display = ('id', 'name', 'default',)
 
 class MedicalRecordAdmin(admin.ModelAdmin):
-  list_display = ('id', 'patient', 'exam',)
+  list_display = ('id', 'patient',)
 
 class VetRequestAdmin(admin.ModelAdmin):
   list_display = ('id', 'requested_by', 'medical_record',)