chore: fix htmx sorting

DataShades · Jan 8, 2024 · ee5c7ce · ee5c7ce
1 parent 6dc1253
commit ee5c7ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ckanext/collection/templates/collection/serialize/htmx_table_table.html b/ckanext/collection/templates/collection/serialize/htmx_table_table.html
@@ -4,9 +4,14 @@
 {% set sort_name = collection.name ~ ":sort" %}
 {% set sort_value = collection.params.sort %}
 
+{% block table %}
+    <input name="{{ sort_name }}" type="hidden" value="{{ sort_value }}" form="{{ collection.serializer.form_id }}"/>
+    {{ super() }}
+{% endblock table %}
+
 {% block header %}
+
     <tr class="collection-table--row collection-table--header">
-        <input name="{{ sort_name }}" type="hidden" value="{{ sort_value }}" form="{{ collection.serializer.form_id }}"/>
 
         {% for col in collection.columns.names if col in collection.columns.visible %}
             {% set is_sortable = col in collection.columns.sortable %}

diff --git a/ckanext/collection/utils/serialize.py b/ckanext/collection/utils/serialize.py
@@ -229,7 +229,7 @@ def table_id(self):
         return f"{self.prefix}-id--{self.attached.name}"
 
 
-class HtmxTableSerializer(HtmlSerializer[types.TDataCollection]):
+class HtmxTableSerializer(TableSerializer[types.TDataCollection]):
     """Serialize collection into HTML table."""
 
     main_template: str = shared.configurable_attribute(

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = ckanext-collection
-version = 0.1.0a7
+version = 0.1.0a8
 description =
 long_description = file: README.md
 long_description_content_type = text/markdown