From 628eeb31579b85ecc3f2df2a8a1196028469d0a8 Mon Sep 17 00:00:00 2001
From: Birger Schacht <birger.schacht@oeaw.ac.at>
Date: Thu, 21 Mar 2024 13:50:48 +0100
Subject: [PATCH] fix(apis_relations): reuse GenericTable.Meta.sequence for
 tables

This way we use the same order of fields as in the other tables
inheriting from GenericTable.

Closes: #716
---
 apis_core/apis_relations/tables.py | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/apis_core/apis_relations/tables.py b/apis_core/apis_relations/tables.py
index f6352f560..30be3edd5 100644
--- a/apis_core/apis_relations/tables.py
+++ b/apis_core/apis_relations/tables.py
@@ -19,10 +19,10 @@ class TripleTable(GenericTable):
     subj = tables.Column(linkify=True)
     obj = tables.Column(linkify=True)
 
-    class Meta:
+    class Meta(GenericTable.Meta):
         fields = ["id", "subj", "prop", "obj"]
         exclude = ["desc"]
-        sequence = ("id", "subj", "prop", "obj", "...")
+        sequence = tuple(fields) + GenericTable.Meta.sequence
 
 
 class SubjObjColumn(tables.ManyToManyColumn):
@@ -63,21 +63,11 @@ class PropertyTable(GenericTable):
     subject = SubjObjColumn(accessor="subj_class", verbose_name="Subject")
     object = SubjObjColumn(accessor="obj_class", verbose_name="Object")
 
-    class Meta:
+    class Meta(GenericTable.Meta):
         fields = ["subject", "predicate", "object", "predicate_reverse"]
         order_by = "predicate"
         exclude = ["desc"]
-
-    def __init__(self, *args, **kwargs):
-        if "sequence" not in kwargs:
-            kwargs["sequence"] = [
-                "subject",
-                "predicate",
-                "object",
-                "predicate_reverse",
-                "...",
-            ]
-        super().__init__(*args, **kwargs)
+        sequence = tuple(fields) + GenericTable.Meta.sequence
 
     # Use order_ methods to define how individual columns should be sorted.
     # Method names are column names prefixed with "order_".