Merge pull request #1261 from dsenalik/1260-tv3-obi__organism_infrasp…

…ecific

Issue #1260 mask no_rank from appearing

tripal_chado/includes/TripalFields/obi__organism/obi__organism.inc

@@ -125,6 +125,10 @@ class obi__organism extends ChadoField {
       }
       $string = $settings['field_display_string'];
       $label = chado_replace_tokens($string, $organism);
+      // Infraspecific type, if present but not used, can either be NULL,
+      // an empty string, or the term 'no_rank'. Special case processing
+      // so that this 'no_rank' term is not included in the label.
+      $label = trim(preg_replace('/ no_rank/', '', $label));
       $entity->{$field_name}['und'][0]['value'] = [
         $label_term => $label,
         $genus_term => $organism->genus,