Skip to content

Commit

Permalink
Adds queryset filtering to all models with published attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
kriberg committed Oct 12, 2018
1 parent 07d0681 commit 86866ab
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion armada_sde_rest/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.1'
__version__ = '0.1.2'
7 changes: 6 additions & 1 deletion armada_sde_rest/management/commands/generate_viewsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@


QUERYSET_OVERRIDE = {
'InvType': 'filter(published=True)'
'DgmAttributeType': 'filter(published=True)',
'DgmEffect': 'filter(published=True)',
'InvCategory': 'filter(published=True)',
'InvGroup': 'filter(published=True)',
'InvType': 'filter(published=True)',
'RamActivity': 'filter(published=True)',
}

VIEWSETS_HEADER = '''# Generated by v{} for sde v{}
Expand Down
2 changes: 1 addition & 1 deletion armada_sde_rest/serializers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


# Generated by v0.1.0 for sde v0.2.2
# Generated by v0.1.2 for sde v0.3.0
from rest_framework import serializers
from armada_sde import models

Expand Down
2 changes: 1 addition & 1 deletion armada_sde_rest/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by v0.1.0 for sde v0.2.2
# Generated by v0.1.2 for sde v0.3.0
from rest_framework.routers import DefaultRouter
from . import views

Expand Down
12 changes: 6 additions & 6 deletions armada_sde_rest/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by v0.1.0 for sde v0.2.2
# Generated by v0.1.2 for sde v0.3.0
from armada_sde import models
from . import serializers
from .viewsets import SDEViewSet
Expand Down Expand Up @@ -115,13 +115,13 @@ class DgmAttributeCategoryViewSet(SDEViewSet):
class DgmAttributeTypeViewSet(SDEViewSet):
list_serializer = serializers.DgmAttributeTypeListSerializer
details_serializer = serializers.DgmAttributeTypeDetailsSerializer
queryset = models.DgmAttributeType.objects.all()
queryset = models.DgmAttributeType.objects.filter(published=True)


class DgmEffectViewSet(SDEViewSet):
list_serializer = serializers.DgmEffectListSerializer
details_serializer = serializers.DgmEffectDetailsSerializer
queryset = models.DgmEffect.objects.all()
queryset = models.DgmEffect.objects.filter(published=True)


class DgmExpressionViewSet(SDEViewSet):
Expand Down Expand Up @@ -205,7 +205,7 @@ class IndustryBlueprintViewSet(SDEViewSet):
class InvCategoryViewSet(SDEViewSet):
list_serializer = serializers.InvCategoryListSerializer
details_serializer = serializers.InvCategoryDetailsSerializer
queryset = models.InvCategory.objects.all()
queryset = models.InvCategory.objects.filter(published=True)


class InvContrabandTypeViewSet(SDEViewSet):
Expand Down Expand Up @@ -235,7 +235,7 @@ class InvFlagViewSet(SDEViewSet):
class InvGroupViewSet(SDEViewSet):
list_serializer = serializers.InvGroupListSerializer
details_serializer = serializers.InvGroupDetailsSerializer
queryset = models.InvGroup.objects.all()
queryset = models.InvGroup.objects.filter(published=True)


class InvItemViewSet(SDEViewSet):
Expand Down Expand Up @@ -409,7 +409,7 @@ class PlanetSchematicsTypeMapViewSet(SDEViewSet):
class RamActivityViewSet(SDEViewSet):
list_serializer = serializers.RamActivityListSerializer
details_serializer = serializers.RamActivityDetailsSerializer
queryset = models.RamActivity.objects.all()
queryset = models.RamActivity.objects.filter(published=True)


class RamAssemblyLineStationViewSet(SDEViewSet):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django>=2.0
djangorestframework
armada-sde>=0.2.2
armada-sde>=0.3.0
django-environ

0 comments on commit 86866ab

Please sign in to comment.