Fixed bug where event page FAR could differ from floored VOEvent FAR for external users.

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 

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,

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.

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>