Made field widgets consistent when checking for default values from form submits

tripal_chado/includes/TripalFields/chado_linker__contact/chado_linker__contact_widget.inc

@@ -46,7 +46,8 @@ class chado_linker__contact_widget extends ChadoFieldWidget {
     }
 
     // Check $form_state['values'] to see if an AJAX call set the values.
-    if (array_key_exists('values', $form_state) and array_key_exists($delta, $form_state['values'])) {
+    if (array_key_exists('values', $form_state) and
+        array_key_exists($field_name, $form_state['values'])) {
       $name = $form_state['values'][$field_name]['und'][$delta]['name'];
     }
 

tripal_chado/includes/TripalFields/chado_linker__prop/chado_linker__prop_widget.inc

@@ -50,7 +50,7 @@ class chado_linker__prop_widget extends ChadoFieldWidget {
 
     // Check $form_state['values'] to see if an AJAX call set the values.
     if (array_key_exists('values', $form_state) and
-        array_key_exists($delta, $form_state['values'])) {
+        array_key_exists($field_name, $form_state['values'])) {
       $record_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $pkey];
       $fk_value = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $lfkey_field];
       $type_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__type_id'];

tripal_chado/includes/TripalFields/data__accession/data__accession_widget.inc

@@ -31,7 +31,8 @@ class data__accession_widget extends ChadoFieldWidget {
     }
 
     // Check $form_state['values'] to see if an AJAX call set the values.
-    if (array_key_exists('values', $form_state)) {
+    if (array_key_exists('values', $form_state) and
+        array_key_exists($field_name, $form_state['values'])) {
       $dbxref_id = isset($form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $field_column]) ? $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $field_column] : '';
       $db_id = isset($form_state['values'][$field_name]['und'][$delta]['db_id']) ? $form_state['values'][$field_name]['und'][$delta]['db_id'] : '';
       $accession = isset($form_state['values'][$field_name]['und'][$delta]['accession']) ? $form_state['values'][$field_name]['und'][$delta]['accession'] : '';

tripal_chado/includes/TripalFields/sbo__database_cross_reference/sbo__database_cross_reference_widget.inc

@@ -44,7 +44,7 @@ class sbo__database_cross_reference_widget extends ChadoFieldWidget {
 
     // Check $form_state['values'] to see if an AJAX call set the values.
     if (array_key_exists('values', $form_state) and
-        array_key_exists($delta, $form_state['values'])) {
+        array_key_exists($field_name, $form_state['values'])) {
       $record_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $pkey];
       $fkey_value = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $fkey];
       $dbxref_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__dbxref_id'];

tripal_chado/includes/TripalFields/sbo__relationship/sbo__relationship_widget.inc

@@ -103,7 +103,8 @@ class sbo__relationship_widget extends ChadoFieldWidget {
     }
 
     // Check $form_state['values'] to see if an AJAX call set the values.
-    if (array_key_exists('values', $form_state) and array_key_exists($delta, $form_state['values'])) {
+    if (array_key_exists('values', $form_state) and
+        array_key_exists($field_name, $form_state['values'])) {
       $record_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $pkey];
       $subject_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $subject_id_key];
       $object_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $object_id_key];

tripal_chado/includes/TripalFields/schema__alternate_name/schema__alternate_name_widget.inc

@@ -47,7 +47,8 @@ class schema__alternate_name_widget extends ChadoFieldWidget {
     }
 
     // Check $form_state['values'] to see if an AJAX call set the values.
-    if (array_key_exists('values', $form_state) and array_key_exists($delta, $form_state['values'])) {
+    if (array_key_exists('values', $form_state) and
+        array_key_exists($field_name, $form_state['values'])) {
       $record_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $table_name . '__' . $pkey];
       $synonym_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $table_name . '__synonym_id'];
       $pub_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $table_name . '__pub_id'];

tripal_chado/includes/TripalFields/sio__annotation/sio__annotation_widget.inc

@@ -69,27 +69,22 @@ class sio__annotation_widget extends ChadoFieldWidget {
     }
 
     // Check $form_state['values'] to see if an AJAX call set the values.
-    if ((array_key_exists('values', $form_state) and array_key_exists($field_name, $form_state['values'])) or
-        (array_key_exists('input', $form_state) and array_key_exists($field_name, $form_state['input']))) {
+    if (array_key_exists('values', $form_state) and
+        array_key_exists($field_name, $form_state['values'])) {
 
-      $vtype = 'input';
-      if (array_key_exists('values', $form_state)) {
-        $vtype = 'values';
-      }
-
-      $record_id = $form_state[$vtype][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $pkey];
-      $fk_value = $form_state[$vtype][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $fkey_lcolumn];
-      $cvterm_id = $form_state[$vtype][$field_name]['und'][$delta]['chado-' . $field_table . '__cvterm_id'];
+      $record_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $pkey];
+      $fk_value = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__' . $fkey_lcolumn];
+      $cvterm_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__cvterm_id'];
 
       if (array_key_exists('pub_id', $schema['fields'])) {
-        $pub_name = $form_state[$vtype][$field_name]['und'][$delta]['pub'];
-        $pub_id = $form_state[$vtype][$field_name]['und'][$delta]['chado-' . $field_table . '__pub_id'];
+        $pub_name = $form_state['values'][$field_name]['und'][$delta]['pub'];
+        $pub_id = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__pub_id'];
       }
       if (array_key_exists('is_not', $schema['fields'])) {
-        $is_not = $form_state[$vtype][$field_name]['und'][$delta]['chado-' . $field_table . '__is_not'];
+        $is_not = $form_state['values'][$field_name]['und'][$delta]['chado-' . $field_table . '__is_not'];
       }
-      $cvterm_name = $form_state[$vtype][$field_name]['und'][$delta]['cvterm_name'];
-      $cv_id = $form_state[$vtype][$field_name]['und'][$delta]['cv_id'];
+      $cvterm_name = $form_state['values'][$field_name]['und'][$delta]['cvterm_name'];
+      $cv_id = $form_state['values'][$field_name]['und'][$delta]['cv_id'];
       $cvterm = chado_generate_var('cvterm', array(
         'cv_id' => $cv_id,
         'name' => $cvterm_name,
@@ -97,6 +92,7 @@ class sio__annotation_widget extends ChadoFieldWidget {
       if (!$cvterm) {
         $cvterm_name = '';
       }
+      dpm($form_state['values']);
     }
 
     $widget['#prefix'] =  "<span id='$field_name-sio--annotation-$delta'>";