summaryrefslogtreecommitdiff
path: root/archaeological_operations/serializers.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-09-07 18:48:54 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-09-07 18:48:54 +0200
commit041ac7922da55ad24f8d324f076aef07400a1ef5 (patch)
treefb6373f59ae98764019d7ec7ff964d6c60dacd83 /archaeological_operations/serializers.py
parent4e0707fe6b8444dce65bdb7b5ee9401e53cf0de8 (diff)
downloadIshtar-041ac7922da55ad24f8d324f076aef07400a1ef5.tar.bz2
Ishtar-041ac7922da55ad24f8d324f076aef07400a1ef5.zip
Serialization: manage documenst (with filters) - refactoring
Diffstat (limited to 'archaeological_operations/serializers.py')
-rw-r--r--archaeological_operations/serializers.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/archaeological_operations/serializers.py b/archaeological_operations/serializers.py
index 3093bf50a..a833eb10f 100644
--- a/archaeological_operations/serializers.py
+++ b/archaeological_operations/serializers.py
@@ -1,6 +1,7 @@
from django.db.models import Q
-from ishtar_common.serializers import generic_get_results, archive_serialization
+from ishtar_common.serializers_utils import generic_get_results, \
+ archive_serialization
from archaeological_operations import models
@@ -55,7 +56,8 @@ def generate_warehouse_queryset(ids):
def operation_serialization(archive=False, return_empty_types=False,
archive_name=None, operation_queryset=None,
site_queryset=None, cr_queryset=None,
- find_queryset=None, warehouse_queryset=None):
+ find_queryset=None, warehouse_queryset=None,
+ get_queryset=False):
result_queryset = {}
if operation_queryset:
operation_ids = operation_queryset.values_list("id", flat=True)
@@ -117,6 +119,8 @@ def operation_serialization(archive=False, return_empty_types=False,
elif warehouse_queryset:
warehouse_ids = warehouse_queryset.values_list("id", flat=True)
result_queryset = generate_warehouse_queryset(warehouse_ids)
+ if get_queryset:
+ return result_queryset
result = generic_get_results(OPERATION_MODEL_LIST, "operations",
result_queryset=result_queryset)