Minor fixes

tripal_chado/includes/fields/chado_base__dbxref_id.inc

@@ -23,15 +23,15 @@ class chado_base__dbxref_id extends TripalField {
   /**
    * @see TripalField::attach_info()
    */
-  function attach_info($entity_type, $bundle, $target) {
+  function attach_info($entity_type, $bundle, $settings) {
 
     $field_info = array();
 
-    $table_name = $target['data_table'];
-    $type_table = $target['type_table'];
-    $type_field = $target['field'];
-    $cv_id      = $target['cv_id'];
-    $cvterm_id  = $target['cvterm_id'];
+    $table_name = $settings['data_table'];
+    $type_table = $settings['type_table'];
+    $type_field = $settings['field'];
+    $cv_id      = $settings['cv_id'];
+    $cvterm_id  = $settings['cvterm_id'];
 
     // Check the schema for the data table if it does not have
     // a 'dbxref_id' column then we don't want to attach this field.

tripal_chado/includes/fields/chado_base__organism_id.inc

@@ -83,7 +83,7 @@ class chado_base__organism_id extends TripalField {
       'field types' => array('chado_base__organism_id'),
       'settings' => array(
         'field_display_teaser' => 0,
-        'field_display_string' => '<i>[organism__genus] [organism__species]</i>',
+        'field_display_string' => '<i>[organism.genus] [organism.species]</i>',
       ),
     );
   }
@@ -95,17 +95,17 @@ class chado_base__organism_id extends TripalField {
     $settings = $display['settings'];
     $summary = 'Settings summary: ';
     if (array_key_exists('field_display_teaser', $settings) and
-        $settings['field_display_teaser'] == 1) {
-          $summary .= 'displays the organism teaser if published.';
-        }
-        else if (array_key_exists('field_display_string', $settings)) {
-          $summary .= 'uses the token string "' . $settings['field_display_string'] . '"';
-        }
-        else {
-          $summary .= "uses display defaults.";
-        }
-
-        return $summary;
+      $settings['field_display_teaser'] == 1) {
+      $summary .= 'displays the organism teaser if published.';
+    }
+    else if (array_key_exists('field_display_string', $settings)) {
+      $summary .= 'uses the token string "' . $settings['field_display_string'] . '"';
+    }
+    else {
+      $summary .= "uses display defaults.";
+    }
+
+    return $summary;
   }
 
   /**
@@ -228,6 +228,7 @@ class chado_base__organism_id extends TripalField {
    */
   public function widget_form(&$widget, $form, $form_state, $field, $instance,
       $langcode, $items, $delta, $element) {
+
     $options = tripal_get_organism_select_options(FALSE);
     $widget['value'] = array(
       '#type' => 'select',