From 1d19afa72df61a1578a7a0130bf5a137e3718727 Mon Sep 17 00:00:00 2001 From: Ross Date: Wed, 25 Mar 2026 21:26:32 +0000 Subject: [PATCH] Refactor tables to inherit from SelectionTable for consistent behavior across Anatomy and Question tables --- anatomy/tables.py | 8 +++----- shorts/tables.py | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/anatomy/tables.py b/anatomy/tables.py index 8f246d43..83308bce 100644 --- a/anatomy/tables.py +++ b/anatomy/tables.py @@ -1,7 +1,7 @@ import django_tables2 as tables from django_tables2.utils import A -from generic.tables import SingleImageColumn +from generic.tables import SingleImageColumn, SelectionTable from .models import AnatomyQuestion, UserAnswer @@ -13,7 +13,7 @@ from easy_thumbnails.exceptions import InvalidImageFormatError #from generic.tables import UserAnswerTable -class AnatomyQuestionTable(tables.Table): +class AnatomyQuestionTable(SelectionTable): edit = tables.LinkColumn( "anatomy:anatomy_question_update", text="Edit", args=[A("pk")], orderable=False ) @@ -30,9 +30,7 @@ class AnatomyQuestionTable(tables.Table): ) exams = tables.ManyToManyColumn(verbose_name="Exams") - selection = tables.CheckBoxColumn(accessor="pk", orderable=False) - - class Meta: + class Meta(SelectionTable.Meta): model = AnatomyQuestion template_name = "django_tables2/bootstrap4.html" fields = ( diff --git a/shorts/tables.py b/shorts/tables.py index 2eb88e7b..23e6b972 100644 --- a/shorts/tables.py +++ b/shorts/tables.py @@ -2,7 +2,7 @@ import django_tables2 as tables from django_tables2.utils import A -from generic.tables import FirstImageColumn +from generic.tables import FirstImageColumn, SelectionTable from .models import Question, UserAnswer @@ -15,7 +15,7 @@ from easy_thumbnails.exceptions import InvalidImageFormatError -class QuestionTable(tables.Table): +class QuestionTable(SelectionTable): edit = tables.LinkColumn('shorts:question_update', text='Edit', args=[A('pk')], @@ -36,9 +36,9 @@ class QuestionTable(tables.Table): exams = tables.ManyToManyColumn(verbose_name="Exams") - selection = tables.CheckBoxColumn(accessor="pk", orderable=False) + #selection = tables.CheckBoxColumn(accessor="pk", orderable=False) - class Meta: + class Meta(SelectionTable.Meta): model = Question template_name = "django_tables2/bootstrap4.html" fields = ("normal", "examination",