Merge pull request #1082 from Ferrisx4/1077-legacy_content

1077 legacy content
tripal · Sep 8, 2020 · 51312b0 · 51312b0
2 parents ff72064 + 47570f3
commit 51312b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tripal_chado/includes/TripalFields/data__protein_sequence/data__protein_sequence.inc b/tripal_chado/includes/TripalFields/data__protein_sequence/data__protein_sequence.inc
@@ -93,7 +93,7 @@ class data__protein_sequence extends ChadoField {
       WHERE
         FR.object_id = :feature_id and
         CVT.name = 'polypeptide' and
-        RCVT.name = 'derives_from'
+        RCVT.name  IN ('derives_from', 'part_of')
       ORDER BY FR.rank ASC
     ";
     $proteins = chado_query($sql, [':feature_id' => $feature->feature_id]);
@@ -108,4 +108,4 @@ class data__protein_sequence extends ChadoField {
       $num_seqs++;
     }
   }
-}
+}
diff --git a/tripal_chado/includes/TripalFields/so__transcript/so__transcript_formatter.inc b/tripal_chado/includes/TripalFields/so__transcript/so__transcript_formatter.inc
@@ -32,7 +32,7 @@ class so__transcript_formatter extends ChadoFieldFormatter {
       $loc = $transcript['SO:0000735'];
       $type = $transcript['rdfs:type'];
 
-      // Add a link i there is an entity.
+      // Add a link if there is an entity.
       if (array_key_exists('entity', $item['value']) and $item['value']['entity']) {
         list($entity_type, $entity_id) = explode(':', $item['value']['entity']);
         $feature_name = l($feature_name, "bio_data/" . $entity_id, ['attributes' => ['target' => "_blank"]]);