Merge branch 'release/0.3.38' into main

meta-trial · Oct 10, 2024 · f57aa19 · f57aa19
2 parents b27ebe1 + ad2ee54
commit f57aa19
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,10 @@
 Changes
 -------
 
+0.3.38
+------
+- fix Endpoint admins to reference fbg_date not fbg_datetime
+
 0.3.37
 ------
 - change Endpoint model datetime fields to date

diff --git a/meta_reports/admin/endpoints_admin.py b/meta_reports/admin/endpoints_admin.py
@@ -8,7 +8,7 @@
 
 @admin.register(Endpoints, site=meta_reports_admin)
 class EndpointsAdmin(EndpointsModelAdminMixin, admin.ModelAdmin):
-    queryset_filter = dict(offstudy_datetime__isnull=True)
+    queryset_filter = dict(offstudy_date__isnull=True)
 
     def rendered_change_list_note(self):
         return render_to_string("meta_reports/endpoints_change_list_note.html")
diff --git a/meta_reports/admin/modeladmin_mixins.py b/meta_reports/admin/modeladmin_mixins.py
@@ -79,9 +79,9 @@ def subject(self, obj=None):
     def visit(self, obj=None):
         return obj.visit_code
 
-    @admin.display(description="FBG DATE", ordering="fbg_date")
-    def fbg_date(self, obj=None):
-        return obj.fbg_datetime.date() if obj.fbg_datetime else None
+    # @admin.display(description="FBG DATE", ordering="fbg_date")
+    # def fbg_date(self, obj=None):
+    #     return obj.fbg_datetime.date() if obj.fbg_datetime else None
 
     @admin.display(description="FAST", ordering="fasting")
     def fast(self, obj=None):