Cleanup for consistency

WesternFriend · Jun 1, 2024 · 20178bd · 20178bd
1 parent dac24e7
commit 20178bd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/contact/views.py b/contact/views.py
@@ -1,4 +1,3 @@
-from wagtail.admin.ui.tables import Column
 from wagtail.admin.viewsets.base import ViewSetGroup
 from wagtail.admin.viewsets.pages import PageListingViewSet
 from memorials.views import MemorialViewSet
@@ -14,18 +13,6 @@ class PersonViewSet(PageListingViewSet):
     menu_label = "People"
     name = "people"
     icon = "user"
-    columns = [
-        Column(
-            "given_name",
-            label="Given Name",
-            sort_key="given_name",
-        ),
-        Column(
-            "family_name",
-            label="Family Name",
-            sort_key="family_name",
-        ),
-    ]
     search_fields = ["given_name", "family_name"]
     # Tried to add ordering to the columns, but it didn't work.
     # https://stackoverflow.com/questions/78563124/how-to-specify-ordering-for-wagtal-pagelistingviewset

diff --git a/documents/views.py b/documents/views.py
@@ -1,6 +1,7 @@
 import django_filters
 from wagtail.admin.filters import DateRangePickerWidget
-from wagtail.admin.ui.tables import Column, TitleColumn
+from wagtail.admin.ui.tables import Column
+from wagtail.admin.ui.tables.pages import BulkActionsColumn, PageTitleColumn
 from wagtail.admin.viewsets.pages import PageListingViewSet
 
 from .models import PublicBoardDocument, MeetingDocument
@@ -27,10 +28,14 @@ class PublicBoardDocumentViewSet(PageListingViewSet):
     icon = "doc-full"
     name = "public_board_documents"
     columns = [
-        TitleColumn(
+        BulkActionsColumn(
+            "id",
+        ),
+        PageTitleColumn(
             "title",
             label="Title",
             sort_key="title",
+            classname="title",
         ),
         Column(
             "publication_date",
@@ -65,10 +70,14 @@ class MeetingDocumentViewSet(PageListingViewSet):
     icon = "doc-full"
     name = "meeting_documents"
     columns = [
-        Column(
+        BulkActionsColumn(
+            "id",
+        ),
+        PageTitleColumn(
             "title",
             label="Title",
             sort_key="title",
+            classname="title",
         ),
         Column(
             "publication_date",

diff --git a/events/views.py b/events/views.py
@@ -1,7 +1,7 @@
 import django_filters
 from wagtail.admin.filters import DateRangePickerWidget
 from wagtail.admin.ui.tables import Column
-from wagtail.admin.ui.tables.pages import PageTitleColumn
+from wagtail.admin.ui.tables.pages import BulkActionsColumn, PageTitleColumn
 from wagtail.admin.viewsets.pages import PageListingViewSet
 
 from .models import Event
@@ -28,6 +28,9 @@ class EventViewSet(PageListingViewSet):
     icon = "date"
     name = "events"
     columns = [
+        BulkActionsColumn(
+            "id",
+        ),
         PageTitleColumn(
             "title",
             label="Title",

diff --git a/wf_pages/views.py b/wf_pages/views.py
@@ -1,7 +1,7 @@
 import django_filters
 from wagtail.admin.filters import DateRangePickerWidget
 from wagtail.admin.ui.tables import Column
-from wagtail.admin.ui.tables.pages import PageTitleColumn
+from wagtail.admin.ui.tables.pages import BulkActionsColumn, PageTitleColumn
 from wagtail.admin.viewsets.pages import PageListingViewSet
 
 
@@ -28,6 +28,9 @@ class MollyWingateBlogPageViewSet(PageListingViewSet):
     icon = "list-ul"
     name = "molly_wingate_blog_pages"
     columns = [
+        BulkActionsColumn(
+            "id",
+        ),
         PageTitleColumn(
             "title",
             label="Title",