Browse Source

Fixed issue with local contact field

Stephen Ficklin 7 years ago
parent
commit
1f517500bc

+ 0 - 1
tripal_chado/includes/TripalFields/chado_linker__contact/chado_linker__contact.inc

@@ -138,7 +138,6 @@ class chado_linker__contact extends ChadoField {
     $fkey_lcolumn = key($schema['foreign keys'][$base_table]['columns']);
     $fkey_rcolumn = $schema['foreign keys'][$base_table]['columns'][$fkey_lcolumn];
 
-
     // Set some defaults for the empty record.
     $entity->{$field_name}['und'][0] = array(
       'value' => array(),

+ 12 - 10
tripal_chado/includes/TripalFields/local__contact/local__contact.inc

@@ -137,16 +137,18 @@ class local__contact extends ChadoField {
     if ($field_table == 'biomaterial') {
       if ($record) {
         $contact = $record->biosourceprovider_id;
-        $entity->{$field_name}['und'][0] = array(
-          'value' => array(
-            $type_term => $contact->type_id ? $contact->type_id->name : '',
-            $name_term => $contact->name,
-            $description_term => $contact->description,
-          ),
-          $entity->{$field_name}['und'][0]['chado-biomaterial__biosourceprovider_id'] = $contact->contact_id,
-        );
-        if (property_exists($contact, 'entity_id')) {
-          $entity->{$field_name}['und'][0]['value']['entity'] = 'TripalEntity:' . $contact->entity_id;
+        if ($contact) {
+          $entity->{$field_name}['und'][0] = array(
+            'value' => array(
+              $type_term => $contact->type_id ? $contact->type_id->name : '',
+              $name_term => $contact->name,
+              $description_term => $contact->description,
+            ),
+            $entity->{$field_name}['und'][0]['chado-biomaterial__biosourceprovider_id'] = $contact->contact_id,
+          );
+          if (property_exists($contact, 'entity_id')) {
+            $entity->{$field_name}['und'][0]['value']['entity'] = 'TripalEntity:' . $contact->entity_id;
+          }
         }
       }
     };