瀏覽代碼

fix issues from Lacey's review

Jiu9Shen 5 年之前
父節點
當前提交
eb8929ccd8

+ 4 - 1
tripal_jbrowse_mgmt/includes/tripal_jbrowse_mgmt_add.form.inc

@@ -44,9 +44,12 @@ function tripal_jbrowse_mgmt_add_form($form, &$form_state) {
     '#weight' => -8,
   ];
 
+  $analysis_term_entity = tripal_load_term_entity(['vocabulary'=>'operation', 'accession'=>'2945']);
+  $analysis_bundle_entity = tripal_load_bundle_entity(['term_id'=>$analysis_term_entity->id]);
+
   $form['analysis'] = [
     '#title' => t('Analysis'),
-    '#description' => 'Select the analysis to which this instance will be related. Analysis can be created in '.l('Add Tripal Content', 'bio_data/add/3').' if wanted analysis is not available.<br><strong>Please choose analysis carefully</strong> since it can not change once instance is created.',
+    '#description' => 'Select the analysis to which this instance will be related. Analysis can be created in '.l('Add Tripal Content', 'bio_data/add/' . $analysis_bundle_entity->id).' if wanted analysis is not available.<br><strong>Please choose analysis carefully</strong> since it can not change once instance is created.',
     '#type' => 'textfield',
     '#autocomplete_path' => 'admin/tripal/extension/tripal_jbrowse/management/instances/analysis/autocomplete',
     '#weight' => -6,

+ 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],
+          ['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,
+      $instance->analysis->name ?: 'Not provided',
       $instance->user->name,
       $instance->description ?: 'Not provided',
       l('Manage Tracks', 'admin/tripal/extension/tripal_jbrowse/management/instances/' . $instance->id),

+ 2 - 2
tripal_jbrowse_mgmt/tripal_jbrowse_mgmt.module

@@ -136,7 +136,7 @@ function tripal_jbrowse_mgmt_menu() {
 
   $items['admin/tripal/extension/tripal_jbrowse/management/instances/analysis/autocomplete'] = [
     'title' => 'autocomplete for JBrowse instance analysis',
-    'page callback' => '_analysis_autocomplete',
+    'page callback' => '_mgmt_add_analysis_autocomplete',
     'access arguments' => ['administer tripal_jbrowse_mgmt'],
     'type' => MENU_CALLBACK,
   ];
@@ -166,7 +166,7 @@ function tripal_jbrowse_mgmt_permission() {
  * $string = string for autocomplete search
  * to provide analysis names for form in tripal_jbrowse_mgmt_add.form.inc
  */
- function _analysis_autocomplete($string){
+ function _mgmt_add_analysis_autocomplete($string){
    $analysis_4match =array();
    $analysis = db_select('chado.analysis', 'CA')
      ->fields('CA', ['analysis_id', 'name'])