spficklin 13 rokov pred
rodič
commit
ddbee459ef

+ 1 - 1
tripal_analysis_kegg/theme/js/tripal_analysis_kegg.js

@@ -13,7 +13,7 @@ if (Drupal.jsEnabled) {
    });
 
    //------------------------------------------------------------
-   function tripal_analysis_kegg_org_report(item){
+   function tripal_analysis_kegg_org_report(item,baseurl,themedir){
       if(!item){
          $("#tripal_analysis_kegg_org_report").html('');
          return false;

+ 4 - 2
tripal_analysis_kegg/theme/tripal_organism/tripal_organism_kegg_summary.tpl.php

@@ -1,6 +1,7 @@
 <?php
-  $form = $organism->tripal_analysis_kegg->select_form->form;
-  $has_results = $organism->tripal_analysis_kegg->select_form->has_results;
+  $organism = $node->organism;
+  $form = $organism->tripal_analysis_kegg->select_form['form'];
+  $has_results = $organism->tripal_analysis_kegg->select_form['has_results'];
 ?>
 <div id="tripal_organism-kegg_summary-box" class="tripal_organism-info-box tripal-info-box">
   <div  class="tripal_organism-info-box-title tripal-info-box-title">KEGG Analysis Reports</div>
@@ -18,3 +19,4 @@
 </div>
 
 
+

+ 11 - 1
tripal_analysis_kegg/tripal_analysis_kegg.module

@@ -1176,7 +1176,17 @@ function tripal_analysis_kegg_select_form(&$form_state = NULL,$node){
       $analyses[$analysis->analysis_id] = "$analysis->analysis_name";
    }
   
-   # create the select box
+   global $base_url;
+   // we need to set some hidden values for the javascript to use
+   $form['theme_dir'] = array(
+      '#type' => 'hidden',
+      '#value' => drupal_get_path('theme', 'tripal'),
+   );
+   $form['base_url'] = array(
+      '#type' => 'hidden',
+      '#value' => $base_url,
+   );
+   // now generate the select box
    global $base_url;
    $theme_dir = drupal_get_path('theme', 'tripal');
    $form['tripal_analysis_kegg_select'] = array(