From 2c06ecd2f1d44e251d4842b1f74255ce2dceb62f Mon Sep 17 00:00:00 2001 From: Tanner Prestegard <tanner.prestegard@ligo.org> Date: Mon, 30 Apr 2018 11:13:22 -0500 Subject: [PATCH] updating event tag and event log tag resources to include more information than just a link to the detail page --- gracedb/events/api/views.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/gracedb/events/api/views.py b/gracedb/events/api/views.py index 651698754..0189897d9 100644 --- a/gracedb/events/api/views.py +++ b/gracedb/events/api/views.py @@ -1132,12 +1132,16 @@ class EventTagList(APIView): # user is external and has access to the logs. I don't think this is # a big deal, though. rv = { - 'tags' : [ reverse("eventtag-detail",args=[event.graceid(), - tag.name], - request=request) - for tag in event.getAvailableTags()] - } - + 'tags' : [ + { + 'self': reverse("eventtag-detail", args=[ + event.graceid(), tag.name], request=request), + 'name': tag.name, + 'displayName': tag.displayName + } + for tag in event.getAvailableTags() + ] + } return Response(rv) class EventTagDetail(APIView): @@ -1166,12 +1170,17 @@ class EventLogTagList(APIView): @eventlog_required def get(self, request, event, eventlog): rv = { - 'tags' : [ reverse("eventlogtag-detail", - args=[event.graceid(), - eventlog.N, tag.name], - request=request) - for tag in eventlog.tags.all()] - } + 'tags' : [ + { + 'self': reverse("eventlogtag-detail", args=[ + event.graceid(), eventlog.N, tag.name], + request=request), + 'name': tag.name, + 'displayName': tag.displayName + } + for tag in eventlog.tags.all() + ] + } return Response(rv) -- GitLab