Merge branch 'release_fixes_3' of https://github.com/LCOGT/observatio…

…n-portal into release_fixes_3
observatorycontrolsystem · Jun 28, 2019 · d8280fe · d8280fe
2 parents e3dbb2f + dce4aa9
commit d8280fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/observation_portal/requestgroups/models.py b/observation_portal/requestgroups/models.py
@@ -111,6 +111,7 @@ def get_absolute_url(self):
 
     def as_dict(self):
         ret_dict = model_to_dict(self)
+        ret_dict['created'] = self.created
         ret_dict['submitter'] = self.submitter.username
         ret_dict['proposal'] = self.proposal.id
         ret_dict['requests'] = [r.as_dict() for r in self.requests.all()]

diff --git a/observation_portal/userrequests/conversion.py b/observation_portal/userrequests/conversion.py
@@ -232,7 +232,7 @@ def convert_requestgroup_to_userrequest(requestgroup):
     for request in userrequest['requests']:
         request['completed'] = None  # if request['state'] != 'COMPLETED' else request['modified']
         request['target'] = request['configurations'][0]['target']
-        request['target']['type'] = rg_target_type_to_ur(request['target']['type'])
+        request['target']['type'] = rg_target_type_to_ur(request['target'].get('type', ''))
         request['target']['radvel'] = request['target'].get('extra_params', {}).get('radial_velocity', 0.0)
         request['target']['vmag'] = request['target'].get('extra_params', {}).get('v_magnitude', None)
         request['constraints'] = request['configurations'][0]['constraints']