Browse Source

fix analysis problem for tripal_jbrowse_page, and warnings

Jiu9Shen 5 năm trước cách đây
mục cha
commit
4cb33a91a7

+ 1 - 1
tripal_jbrowse_mgmt/includes/tripal_jbrowse_mgmt_instance.page.inc

@@ -36,7 +36,7 @@ function tripal_jbrowse_mgmt_instance_page($instance_id) {
         'header' => ['Key', 'Value'],
         'rows' => [
           ['Instance Name', $instance->title],
-          ['Analysis Name', $instance->analysis->name ?: 'Not provided'],
+          ['Analysis Name', $instance->analysis->name ?? 'Not provided'],
           ['Created At', date('m/d/Y', $instance->created_at)],
           [
             'Organism',

+ 1 - 1
tripal_jbrowse_mgmt/includes/tripal_jbrowse_mgmt_list.page.inc

@@ -44,7 +44,7 @@ function tripal_jbrowse_mgmt_instances_page() {
         $instance->title,
         'admin/tripal/extension/tripal_jbrowse/management/instances/' . $instance->id
       ),
-      $instance->analysis->name ?: 'Not provided',
+      $instance->analysis->name ?? 'Not provided',
       $instance->user->name,
       $instance->description ?: 'Not provided',
       l('Manage Tracks', 'admin/tripal/extension/tripal_jbrowse/management/instances/' . $instance->id),

+ 5 - 1
tripal_jbrowse_page/theme/jbrowse-instance--public-listing.tpl.php

@@ -6,7 +6,11 @@
 
     <div class="jbrowse-instance">
       <h3><?php print l($instance->title, $instance->url); ?></h3>
-      <p><?php print $instance->description; ?></p>
+      <p><?php
+      if(property_exists($instance, 'analysis')) {
+        print 'Analysis: ' . $instance->analysis->name . "<br>";
+      }
+      print $instance->description; ?></p>
       <span class="jbrowse-launch-link"><?php print l('Launch JBrowse', $instance->url); ?></span>
     </div>