diff --git a/gracedb/permission_utils.py b/gracedb/permission_utils.py index 5acda637fedbfaf122acf17b5f5c9dc84ca9d979..187dded49d342a332dac6c9cdc8a2835942216ea 100644 --- a/gracedb/permission_utils.py +++ b/gracedb/permission_utils.py @@ -101,7 +101,6 @@ def is_external(user): return False else: return True -# return True #------------------------------------------------------------------------------- # A utility for determining whether an external user should have access to a diff --git a/gracedb/view_utils.py b/gracedb/view_utils.py index 91d9de0b8e133aa43263ec464e6bed7c22066844..4e2f9d4b7b02b836860171cdea1116df1a9733c5 100644 --- a/gracedb/view_utils.py +++ b/gracedb/view_utils.py @@ -130,7 +130,8 @@ def eventToDict(event, columns=None, request=None): rv['gpstime'] = event.gpstime rv['instruments'] = event.instruments rv['nevents'] = event.nevents - rv['far'] = event.far + floored_far = max(event.far, settings.VOEVENT_FAR_FLOOR) + rv['far'] = floored_far if is_external(request.user) else event.far rv['likelihood'] = event.likelihood rv['labels'] = dict([ (labelling.label.name, diff --git a/gracedb/views.py b/gracedb/views.py index ce10213a4e51bb478934cdbfd727de879f9cad96..926476d9ae8123253eac4d90408a189123bf4e57 100644 --- a/gracedb/views.py +++ b/gracedb/views.py @@ -348,6 +348,10 @@ def view(request, event): # needs to know that in order to decide what pieces of information to show. context['user_is_external'] = is_external(request.user) + # FAR must be floored in the same way as in the VOEvent. + floored_far = max(event.far, settings.VOEVENT_FAR_FLOOR) + context['display_far'] = floored_far if is_external(request.user) else event.far + # Does the user have permission to sign off on the event as the control room operator? operator_signoff_authorized = False # XXX Note that this may not be the best way to perform the authorization check. diff --git a/templates/gracedb/event_detail.html b/templates/gracedb/event_detail.html index 0b602f7c1afaad8b7664b69db07e67432f7c8e75..c02610caa2d0769464c6dbb7e32b2bea95f6fd62 100644 --- a/templates/gracedb/event_detail.html +++ b/templates/gracedb/event_detail.html @@ -204,7 +204,8 @@ <!-- <span title="{{ object.gpstime|gpsdate }}">{{ object.gpstime }}</span> --> {{ object.gpstime|multiTime:"gps" }} {% endif %}</td> - <td>{{ object.far|scientific }}</td> + {# NOTE: XXX Using event_far so it can be floored for external users. #} + <td>{{ display_far|scientific }}</td> <td><a href="{{ object.weburl }}">Data</a></td> <td>{{ object.created|multiTime:"created" }}</td> </tr>