Skip to content
Snippets Groups Projects
Commit 380971c9 authored by Erwan Rouchet's avatar Erwan Rouchet
Browse files

Remove Mirador URL stuff

parent 73cd3f7e
No related branches found
No related tags found
1 merge request!156Remove Mirador URL from API
......@@ -5,7 +5,7 @@ from arkindex.images.serializers import ZoneSerializer, ImageSerializer
from arkindex.documents.serializers.light import ElementLightSerializer, CorpusLightSerializer
from arkindex.dataimport.serializers import RevisionSerializer
from arkindex.dataimport.models import EventType
from arkindex.project.serializer_fields import EnumField, ViewerURLField
from arkindex.project.serializer_fields import EnumField
class MetaDataSerializer(serializers.ModelSerializer):
......@@ -96,9 +96,6 @@ class ElementLightSerializer(serializers.ModelSerializer):
corpus = CorpusLightSerializer(read_only=True)
thumbnail_url = serializers.URLField(source='thumbnail.url', read_only=True)
# TODO: detect correct manifest per element type
viewer_url = ViewerURLField('api:volume-manifest')
class Meta:
model = Element
fields = (
......@@ -107,7 +104,6 @@ class ElementLightSerializer(serializers.ModelSerializer):
'name',
'corpus',
'thumbnail_url',
'viewer_url',
)
......
......@@ -3,7 +3,6 @@ from arkindex.documents.models import Act, Page
from arkindex.documents.serializers.light import CorpusLightSerializer
from arkindex.documents.serializers.elements import ElementLightSerializer
from arkindex.documents.serializers.transcriptions import TranscriptionSerializer
from arkindex.project.serializer_fields import ViewerURLField
class PageSearchResultSerializer(serializers.ModelSerializer):
......@@ -44,7 +43,6 @@ class ActSearchResultSerializer(serializers.ModelSerializer):
),
)
corpus = CorpusLightSerializer()
viewer_url = ViewerURLField('api:act-manifest')
class Meta:
model = Act
......@@ -56,5 +54,4 @@ class ActSearchResultSerializer(serializers.ModelSerializer):
'total_transcriptions',
'parent_paths',
'corpus',
'viewer_url',
)
from django.conf import settings
from rest_framework import serializers
from rest_framework.reverse import reverse
from enum import Enum
......@@ -21,14 +19,3 @@ class EnumField(serializers.ChoiceField):
def to_internal_value(self, data):
assert self.enum is not None, "No enum set on EnumField"
return self.enum(data)
class ViewerURLField(serializers.HyperlinkedIdentityField):
'''
Build an absolute url to view this element into Mirador (or something else)
'''
def get_url(self, obj, view_name, request, format):
return '{mirador}?manifest={act_url}'.format(
mirador=settings.MIRADOR_URI,
act_url=reverse(view_name, args=(obj.id, ), request=request, format=format),
)
......@@ -228,9 +228,6 @@ logging.getLogger('elasticsearch').setLevel(logging.WARNING)
# SSLify proxy
SSLIFY_HOST = os.environ.get('SSLIFY_HOST')
# Mirador host setup
MIRADOR_URI = os.environ.get('MIRADOR_URI', 'https://mirador.ark')
# Use SSL proxy
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment