Skip to content

Commit

Permalink
Stub code restored, see #196 for details
Browse files Browse the repository at this point in the history
  • Loading branch information
landswellsong committed May 5, 2017
1 parent 2de0915 commit 59fe0d8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 20 deletions.
11 changes: 9 additions & 2 deletions backend/promis/backend_api/serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,15 @@ class Meta(LookupById):


class SessionsSerializer(serializers.ModelSerializer):
# TODO: wtf? /quicklook/ here
measurements = SwaggerHyperlinkedRelatedField(many = True, read_only = True, view_name = 'measurement-detail')
# TODO: STUB, see #196
#measurements = SwaggerHyperlinkedRelatedField(many = True, read_only = True, view_name = 'measurement-detail')
# cut from here:
measurements = SerializerMethodField()
def get_measurements(self, obj):
return (self.context['request'].build_absolute_uri('/api/measurements/' + str(m.id))
for m in models.Measurement.objects.filter(session = obj))
# to here ^

space_project = SwaggerHyperlinkedRelatedField(many = False, read_only = True, view_name = 'space_project-detail')

geo_line = serializers.SerializerMethodField()
Expand Down
17 changes: 0 additions & 17 deletions backend/promis/backend_api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,8 @@
docrout.register(r'api/quicklook', views.QuicklookView)
docrout.register(r'api/download', views.DownloadData)

'''
#== db view ==
#TODO: This is used only for debugging, and should be removed
#TODO: Remove it
dbview = SimpleRouter()
dbview.register(r'functions', views.FunctionsView)
dbview.register(r'documents', views.DocumentsView)
dbview.register(r'parameters', views.ParametersView)
#=============
'''

urlpatterns = router.urls + userreg.urls + [
url('^api-auth/', include('rest_framework.urls', namespace = 'rest_framework')),
url(r'^user/update/$', views.UserUpdate),
] + docrout.urls


# + dbview.urls

#print(urlpatterns)
2 changes: 1 addition & 1 deletion doc/promis_api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ paths:
schema:
type: array
items:
$ref: '#/definitions/IdURL'
$ref: '#/definitions/SessionCompact'
default:
description: Unexpected error
schema:
Expand Down

0 comments on commit 59fe0d8

Please sign in to comment.