From 90a6b86c1ecbbb9f503aa752817575a866adf86e Mon Sep 17 00:00:00 2001 From: Mario Orlandi Date: Mon, 13 Nov 2023 12:32:51 +0100 Subject: [PATCH 1/5] Accept dataset expressed as list of OrderedDict to keep dict ordering with old versions of Python --- query_inspector/templatetags/query_inspector_tags.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/query_inspector/templatetags/query_inspector_tags.py b/query_inspector/templatetags/query_inspector_tags.py index 0ebe860..d031363 100644 --- a/query_inspector/templatetags/query_inspector_tags.py +++ b/query_inspector/templatetags/query_inspector_tags.py @@ -5,6 +5,7 @@ import io import csv import decimal +from collections import OrderedDict from django.urls.exceptions import NoReverseMatch from django import template from django.urls import reverse @@ -322,7 +323,7 @@ def get_foreign_value(obj, column_name): return current_value def get_cell_value(row, column): - if type(row) == dict: + if type(row) in [dict, OrderedDict, ]: value = row.get(column['name']) else: if '__' not in column['name']: @@ -430,7 +431,7 @@ def render_value_as_td(row, column, options): # Experimental: detect all fields if '*' in fields and num_rows > 0: - if type(rows[0]) == dict: + if type(rows[0]) in [dict, OrderedDict, ]: fields = tuple(rows[0].keys()) else: fields = [f.name for f in rows[0]._meta.fields] From b0263025b91aa3807ede2fceff4204324a10d87d Mon Sep 17 00:00:00 2001 From: Mario Orlandi Date: Mon, 13 Nov 2023 12:35:45 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Bump=20version:=201.0.8=20=E2=86=92=201.0.8?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fcff697..e877948 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.8 +current_version = 1.0.8.1 commit = True tag = True From ea77a6c876ca2ea17514ced5c1ae8f5f65a35612 Mon Sep 17 00:00:00 2001 From: Mario Orlandi Date: Mon, 13 Nov 2023 13:07:49 +0100 Subject: [PATCH 3/5] manually adjust version --- query_inspector/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/query_inspector/__init__.py b/query_inspector/__init__.py index 4a2a157..dc8db54 100644 --- a/query_inspector/__init__.py +++ b/query_inspector/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.0.8' +__version__ = '1.0.8.1' from .query_debugger import query_debugger from .generic import get_object_by_uuid_or_404 From 7884c11861e2b4ea2a937f053656ddb14b67846e Mon Sep 17 00:00:00 2001 From: Mario Orlandi Date: Mon, 13 Nov 2023 13:07:53 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Bump=20version:=201.0.8.1=20=E2=86=92=201.0?= =?UTF-8?q?.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- query_inspector/__init__.py | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/query_inspector/__init__.py b/query_inspector/__init__.py index dc8db54..4a2a157 100644 --- a/query_inspector/__init__.py +++ b/query_inspector/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.0.8.1' +__version__ = '1.0.8' from .query_debugger import query_debugger from .generic import get_object_by_uuid_or_404 diff --git a/setup.cfg b/setup.cfg index e877948..f89e0d3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.8.1 +current_version = 1.0.8.2 commit = True tag = True From e77ee5751ef4ba00b07a3f8e77a45bbf24ea5844 Mon Sep 17 00:00:00 2001 From: Mario Orlandi Date: Mon, 13 Nov 2023 13:09:06 +0100 Subject: [PATCH 5/5] manually adjust version to 1.0.8.2 --- query_inspector/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/query_inspector/__init__.py b/query_inspector/__init__.py index 4a2a157..8151dab 100644 --- a/query_inspector/__init__.py +++ b/query_inspector/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.0.8' +__version__ = '1.0.8.2' from .query_debugger import query_debugger from .generic import get_object_by_uuid_or_404