summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/serializers.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-09-06 20:22:55 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-09-06 20:22:55 +0200
commitf7420f6003fce4663c017633407b3044e81ce587 (patch)
tree1e4e3653789d36146acc02cc5838ac54f95a2e28 /archaeological_warehouse/serializers.py
parent2a70fa9be2d231cab962909b56277c81426f04a9 (diff)
downloadIshtar-f7420f6003fce4663c017633407b3044e81ce587.tar.bz2
Ishtar-f7420f6003fce4663c017633407b3044e81ce587.zip
Serialization: warehouse filter
Diffstat (limited to 'archaeological_warehouse/serializers.py')
-rw-r--r--archaeological_warehouse/serializers.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/archaeological_warehouse/serializers.py b/archaeological_warehouse/serializers.py
index 2c44c9dcf..ed5a3f189 100644
--- a/archaeological_warehouse/serializers.py
+++ b/archaeological_warehouse/serializers.py
@@ -13,7 +13,7 @@ WAREHOUSE_MODEL_LIST = [
# TODO: associated documents
-def generate_queryset(base_query_key, ids):
+def generate_warehouse_queryset(base_query_key, ids):
warehouse_division_q, warehouse_q, container_q = None, None, None
container_loca_q = None
for find_key in ("finds", "finds_ref"):
@@ -63,20 +63,21 @@ def warehouse_serialization(archive=False, return_empty_types=False,
if operation_queryset:
operation_ids = operation_queryset.values_list("id", flat=True)
base_query_key = "base_finds__context_record__operation_id__in"
- result_queryset = generate_queryset(base_query_key, operation_ids)
+ result_queryset = generate_warehouse_queryset(base_query_key,
+ operation_ids)
elif site_queryset:
site_ids = site_queryset.values_list("id", flat=True)
base_query_key = "base_finds__context_record__"\
"archaeological_site_id__in"
- result_queryset = generate_queryset(base_query_key, site_ids)
+ result_queryset = generate_warehouse_queryset(base_query_key, site_ids)
elif cr_queryset:
cr_ids = cr_queryset.values_list("id", flat=True)
base_query_key = "base_finds__context_record__id__in"
- result_queryset = generate_queryset(base_query_key, cr_ids)
+ result_queryset = generate_warehouse_queryset(base_query_key, cr_ids)
elif find_queryset:
find_ids = find_queryset.values_list("id", flat=True)
base_query_key = "id__in"
- result_queryset = generate_queryset(base_query_key, find_ids)
+ result_queryset = generate_warehouse_queryset(base_query_key, find_ids)
elif warehouse_queryset:
warehouse_ids = warehouse_queryset.values_list("id", flat=True)
result_queryset = {