autonomic-cooperative/ojuso-map
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run black over entire codebase

Browse Source
This commit is contained in:
Anna Sidwell
2019-08-19 23:37:32 +02:00
parent fc7a9621a7
commit e3e3f6d5db
112 changed files with 8240 additions and 3214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/api/urls.py
View File

@ -12,7 +12,7 @@ from apps.map.models import CaseStudy, PointOfInterest
from . import views
apirouter = routers.DefaultRouter()
apirouter.register(r'case-studies', views.CaseStudyViewSet)
apirouter.register(r'points-of-interest', views.PointOfInterestViewSet)
apirouter.register(r"case-studies", views.CaseStudyViewSet)
apirouter.register(r"points-of-interest", views.PointOfInterestViewSet)
urlpatterns = apirouter.urls

39
apps/api/views.py
View File

@ -13,7 +13,7 @@ from apps.map.models import CaseStudy, PointOfInterest
class UserSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = User
fields = ('url', 'username', 'email', 'is_staff')
fields = ("url", "username", "email", "is_staff")
class UserViewSet(viewsets.ModelViewSet):
@ -24,28 +24,30 @@ class UserViewSet(viewsets.ModelViewSet):
class FileSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = File
fields = ('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')
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
geo_field = "location"
fields = (
'country',
'country_name',
'entry_name',
'images',
'location',
'positive_or_negative',
'positive_or_negative_display',
'sector_of_economy',
'slug'
"country",
"country_name",
"entry_name",
"images",
"location",
"positive_or_negative",
"positive_or_negative_display",
"sector_of_economy",
"slug",
)
@ -54,20 +56,13 @@ class CaseStudyViewSet(viewsets.ModelViewSet):
serializer_class = CaseStudySerializer
class PointOfInterestSerializer(gis_serializers.GeoFeatureModelSerializer):
class Meta:
model = PointOfInterest
geo_field = "location"
fields = (
'title',
'synopsis',
'link',
'slug'
)
fields = ("title", "synopsis", "link", "slug")
class PointOfInterestViewSet(viewsets.ModelViewSet):
queryset = PointOfInterest.objects.approved()
serializer_class = PointOfInterestSerializer