Changeset 358b26f for asadb

Timestamp:

Feb 11, 2013, 3:33:07 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

83d82e7

Parents:

ea8e8b6

git-author:

Alex Dehnert <adehnert@…> (02/11/13 03:33:07)

git-committer:

Alex Dehnert <adehnert@…> (02/11/13 03:33:07)

Message:

Filter by whether an item is current (ASA-#99)

OfficeHolder?, SpaceAccessListEntry?, and SpaceAssignment? all track a start and
end time for each of their records. This allows filtering in the admin by
whether a record was previously valid, is currently valid, or will be valid in
the future.

Location:

asadb

Files:

• groups/admin.py (modified) (3 diffs)
• space/admin.py (modified) (4 diffs)
• util/admin.py (added)

asadb/groups/admin.py

@@ +1 @@
+from django.contrib import admin
+
+from reversion.admin import VersionAdmin
+
 import groups.models
-from django.contrib import admin
-from reversion.admin import VersionAdmin
+import util.admin
 
 class GroupAdmin(VersionAdmin):
@@ -98 +101 @@
 
 class OfficeHolderAdmin(VersionAdmin):
+    class OfficeHolderPeriodFilter(util.admin.TimePeriodFilter):
+        start_field = 'start_time'
+        end_field = 'end_time'
+
     list_display = (
         'id',
@@ -121 +128 @@
     list_filter = [
         'role',
+        OfficeHolderPeriodFilter,
     ]
 admin.site.register(groups.models.OfficeHolder, OfficeHolderAdmin)

asadb/space/admin.py

@@ +1 @@
+from django.contrib import admin
+
+from reversion.admin import VersionAdmin
+
 import space.models
-from django.contrib import admin
-from reversion.admin import VersionAdmin
+import util.admin
 
 class Admin_Space(VersionAdmin):
@@ -15 +18 @@
 
 class Admin_SpaceAssignment(admin.ModelAdmin):
+    class AssignmentPeriodFilter(util.admin.TimePeriodFilter):
+        start_field = 'start'
+        end_field = 'end'
+
     list_max_show_all = 500
     list_display = (
@@ -24 +31 @@
     )
     list_display_links = list_display
-    list_filter = ('space', )
+    list_filter = (AssignmentPeriodFilter, 'space', )
     search_fields = ( 'group__name', 'group__officer_email', 'space__number', )
 admin.site.register(space.models.SpaceAssignment, Admin_SpaceAssignment)
 
 class Admin_SpaceAccessListEntry(admin.ModelAdmin):
+    class AccessPeriodFilter(util.admin.TimePeriodFilter):
+        start_field = 'start'
+        end_field = 'end'
+
     list_display = (
         'group',
@@ -37 +48 @@
     )
     list_display_links = list_display
+    list_filter = (AccessPeriodFilter, 'space', )
     search_fields = (
         'group__name', 'group__officer_email',