From b1e4103365d58207babad80094ef504a583f4a90 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 3 Jul 2019 00:28:29 +0000 Subject: [PATCH] ignore direct requests without an obs --- observation_portal/requestgroups/models.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/observation_portal/requestgroups/models.py b/observation_portal/requestgroups/models.py index ef4ccb84..a6f27ed3 100644 --- a/observation_portal/requestgroups/models.py +++ b/observation_portal/requestgroups/models.py @@ -196,10 +196,11 @@ def as_dict(self, for_observation=False): ret_dict['configurations'] = [c.as_dict() for c in self.configurations.all()] if not for_observation: if self.request_group.observation_type == RequestGroup.DIRECT: - observation = self.observation_set.first() - ret_dict['location'] = {'site': observation.site, 'enclosure': observation.enclosure, - 'telescope': observation.telescope} - ret_dict['windows'] = [{'start': observation.start, 'end': observation.end}] + if self.observation_set.count() > 0: + observation = self.observation_set.first() + ret_dict['location'] = {'site': observation.site, 'enclosure': observation.enclosure, + 'telescope': observation.telescope} + ret_dict['windows'] = [{'start': observation.start, 'end': observation.end}] else: ret_dict['location'] = self.location.as_dict() if hasattr(self, 'location') else {} ret_dict['windows'] = [w.as_dict() for w in self.windows.all()]