From 9f53334ba76bbe2a93b68607181acfa51e2e544c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 28 May 2019 13:08:58 +0200 Subject: Statistics cache: rpovide an expected type in order to fix bad cache init --- archaeological_operations/models.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'archaeological_operations') diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index b220ff1ec..55e90ec07 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -1388,7 +1388,8 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem, @property def nb_context_records_by_type(self, update=False): - return self._get_or_set_stats('_nb_context_records_by_type', update) + return self._get_or_set_stats('_nb_context_records_by_type', update, + expected_type=list) def _nb_context_records_by_type(self): nbs = [] @@ -1401,7 +1402,8 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem, @property def nb_context_records_by_periods(self, update=False): - return self._get_or_set_stats('_nb_context_records_by_periods', update) + return self._get_or_set_stats('_nb_context_records_by_periods', update, + expected_type=list) def _nb_context_records_by_periods(self): nbs = [] @@ -1428,7 +1430,8 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem, @property def nb_finds_by_material_type(self, update=False): - return self._get_or_set_stats('_nb_finds_by_material_type', update) + return self._get_or_set_stats('_nb_finds_by_material_type', update, + expected_type=list) def _nb_finds_by_material_type(self): from archaeological_finds.models import Find @@ -1449,7 +1452,8 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem, @property def nb_finds_by_types(self, update=False): - return self._get_or_set_stats('_nb_finds_by_types', update) + return self._get_or_set_stats('_nb_finds_by_types', update, + expected_type=list) def _nb_finds_by_types(self): from archaeological_finds.models import Find @@ -1472,7 +1476,8 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem, @property def nb_finds_by_periods(self, update=False): - return self._get_or_set_stats('_nb_finds_by_periods', update) + return self._get_or_set_stats('_nb_finds_by_periods', update, + expected_type=list) def _nb_finds_by_periods(self): from archaeological_finds.models import Find @@ -1505,7 +1510,8 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem, @property def nb_documents_by_types(self, update=False): - return self._get_or_set_stats('_nb_documents_by_types', update) + return self._get_or_set_stats('_nb_documents_by_types', update, + expected_type=list) def _nb_documents_by_types(self): docs = {} @@ -1523,7 +1529,7 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem, docs[st] = 0 docs[st] += q.filter(source_type=st).count() docs = [(str(SourceType.objects.get(pk=k)), docs[k]) for k in docs] - return sorted(docs, key=lambda x: x[0]) + return list(sorted(docs, key=lambda x: x[0])) @property def nb_stats_finds_by_ue(self, update=False): -- cgit v1.2.3