Fix CaseStudy serialisation..
..by ensuring CS images are serialised correctly
This commit is contained in:
parent
2bb7ea5561
commit
c32ddf1abb
@ -145,7 +145,7 @@ function getLabelClass(pos_or_neg) {
|
||||
|
||||
function popup(feature, layer) {
|
||||
layer.bindPopup(
|
||||
"<img src='"+feature.properties.image+"' width='100%'>"+
|
||||
"<img src='"+feature.properties.images[0].file+"' width='100%'>"+
|
||||
"<div class='popup-head'>"+
|
||||
"<h5>"+feature.properties.entry_name+"</h5>" +
|
||||
"<i>"+feature.properties.country_name+"</i>"+
|
||||
|
@ -18,10 +18,13 @@ from django.urls import reverse
|
||||
from django.conf.urls.i18n import i18n_patterns
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth.models import User
|
||||
from apps.map.models import CaseStudy
|
||||
|
||||
from rest_framework import routers, serializers, viewsets
|
||||
from rest_framework_gis import serializers as gis_serializers
|
||||
|
||||
from apps.files.models import File
|
||||
from apps.map.models import CaseStudy
|
||||
|
||||
from .views import LanguageDropdownView
|
||||
|
||||
class UserSerializer(serializers.HyperlinkedModelSerializer):
|
||||
@ -35,10 +38,17 @@ class UserViewSet(viewsets.ModelViewSet):
|
||||
serializer_class = UserSerializer
|
||||
|
||||
|
||||
class FileSerializer(serializers.HyperlinkedModelSerializer):
|
||||
class Meta:
|
||||
model = File
|
||||
fields = ('file',)
|
||||
|
||||
|
||||
class CaseStudySerializer(gis_serializers.GeoFeatureModelSerializer):
|
||||
sector_of_economy = serializers.CharField(source='get_sector_of_economy_display')
|
||||
country_name = serializers.CharField(source='get_country_display')
|
||||
positive_or_negative_display = serializers.CharField(source='get_positive_or_negative_display')
|
||||
images = FileSerializer(many=True)
|
||||
|
||||
class Meta:
|
||||
model = CaseStudy
|
||||
@ -47,7 +57,7 @@ class CaseStudySerializer(gis_serializers.GeoFeatureModelSerializer):
|
||||
'country',
|
||||
'country_name',
|
||||
'entry_name',
|
||||
'image',
|
||||
'images',
|
||||
'location',
|
||||
'positive_or_negative',
|
||||
'positive_or_negative_display',
|
||||
|
Loading…
Reference in New Issue
Block a user