Handles for variation in the node configs of a resource-instance or r…

…esource-instance-list datatype, re #4357
archesproject · Dec 22, 2018 · a31e626 · a31e626
1 parent 915bb60
commit a31e626
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/arches/app/models/mobile_survey.py b/arches/app/models/mobile_survey.py
@@ -135,7 +135,12 @@ def serialize(self, fields=None, exclude=None):
                                 break
                     if node['datatype'] == 'resource-instance' or node['datatype'] == 'resource-instance-list':
                         if node['config']['graphid'] is not None:
-                            graph_id = node['config']['graphid'][0]
+                            try:
+                                graphuuid = uuid.UUID(node['config']['graphid'][0])
+                                graph_id = unicode(graphuuid)
+                            except ValueError as e:
+                                graphuuid = uuid.UUID(node['config']['graphid'])
+                                graph_id = unicode(graphuuid)
                             node['config']['options'] = []
                             for resource_instance in Resource.objects.filter(graph_id=graph_id):
                                 node['config']['options'].append({'id': str(resource_instance.pk), 'name': resource_instance.displayname})