From 10947597c8f910152eaa89afadacc2cce227d880 Mon Sep 17 00:00:00 2001
From: vrigal <rigal@teklia.com>
Date: Tue, 3 Dec 2019 11:07:25 +0100
Subject: [PATCH] Revert "Add structure metadata filter in filtered ListElement
endpoints"
This reverts commit c879554ba84c695ad85c1f0126f71a8f924976c0.
---
arkindex/documents/api/elements.py | 52 ++----------------------------
1 file changed, 2 insertions(+), 50 deletions(-)
diff --git a/arkindex/documents/api/elements.py b/arkindex/documents/api/elements.py
index 6463c91a41..c15f019273 100644
--- a/arkindex/documents/api/elements.py
+++ b/arkindex/documents/api/elements.py
@@ -8,9 +8,9 @@ from rest_framework.generics import (
)
from rest_framework import status, response
from rest_framework.response import Response
-from arkindex_common.enums import TranscriptionType, MetaType
+from arkindex_common.enums import TranscriptionType
from arkindex.documents.models import (
- Corpus, Element, ElementPath, Right, MetaData,
+ Corpus, Element, ElementPath, Right,
Classification, ClassificationState, Transcription, Region
)
from arkindex.documents.serializers.elements import (
@@ -115,15 +115,6 @@ class ElementsList(CorpusACLMixin, ListAPIView):
'schema': {
'type': 'boolean',
}
- },
- {
- 'name': 'structural_metadata',
- 'in': 'query',
- 'description': 'Filter elements by a structural metadata.',
- 'required': False,
- 'schema': {
- 'type': 'string'
- }
}
]
}
@@ -147,13 +138,6 @@ class ElementsList(CorpusACLMixin, ListAPIView):
if only_folder is not None:
filters['type__folder'] = only_folder.lower() not in ('false', '0')
- structural_metadata = self.request.query_params.get('structural_metadata')
- if structural_metadata is not None:
- filters['metadatas__in'] = MetaData.objects.filter(
- type=MetaType.Structural,
- value__icontains=structural_metadata
- )
-
if 'corpus' in self.request.query_params:
try:
corpus_id = UUID(self.request.query_params['corpus'])
@@ -388,15 +372,6 @@ class ElementParents(ListAPIView):
'schema': {
'type': 'boolean',
}
- },
- {
- 'name': 'structural_metadata',
- 'in': 'query',
- 'description': 'Filter elements by a structural metadata.',
- 'required': False,
- 'schema': {
- 'type': 'string'
- }
}
]
}
@@ -421,13 +396,6 @@ class ElementParents(ListAPIView):
if only_folder is not None:
filters['type__folder'] = only_folder.lower() not in ('false', '0')
- structural_metadata = self.request.query_params.get('structural_metadata')
- if structural_metadata is not None:
- filters['metadatas__in'] = MetaData.objects.filter(
- type=MetaType.Structural,
- value__icontains=structural_metadata
- )
-
recursive_param = self.request.query_params.get('recursive')
prefetch_related_lookups = ('zone__image__server', 'corpus', 'type')
@@ -542,15 +510,6 @@ class ElementChildren(ListAPIView):
'schema': {
'type': 'boolean',
}
- },
- {
- 'name': 'structural_metadata',
- 'in': 'query',
- 'description': 'Filter elements by a structural metadata.',
- 'required': False,
- 'schema': {
- 'type': 'string'
- }
}
]
}
@@ -575,13 +534,6 @@ class ElementChildren(ListAPIView):
if only_folder is not None:
filters['type__folder'] = only_folder.lower() not in ('false', '0')
- structural_metadata = self.request.query_params.get('structural_metadata')
- if structural_metadata is not None:
- filters['metadatas__in'] = MetaData.objects.filter(
- type=MetaType.Structural,
- value__icontains=structural_metadata
- )
-
recursive_param = self.request.query_params.get('recursive')
prefetch_related_lookups = ('zone__image__server', 'corpus', 'type')
--
GitLab