diff options
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/serializers.py | 8 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 1 |
2 files changed, 7 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) diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 9a1313424..9779ad424 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -38,6 +38,7 @@ from django.utils.translation import ugettext_lazy as _, pgettext, pgettext_lazy from . import models from ishtar_common.views import document_deletion_steps +from ishtar_common.serializers import document_serialization from archaeological_operations import views, serializers from ishtar_common.models import OrganizationType, Organization, ItemKey, \ |