tripal_analysis_go/theme/js/tripal_analysis_go.js

@@ -7,8 +7,22 @@ if (Drupal.jsEnabled) {
        // Select default GO analysis when available
        var selectbox = $('#edit-tripal-analysis-go-select');
        if(selectbox.length > 0){ 
-          selectbox[0].selectedIndex = 1;
-          tripal_analysis_go_org_charts(selectbox.val());
+    	   var option = document.getElementById("analysis_id_for_go_report");
+    	   if (option) {
+    		   var options = document.getElementsByTagName('option');
+    		   var index = 0;
+    		   for (index = 0; index < options.length; index ++) {
+    			   if (options[index].value == option.value) {
+    				   break;
+    			   }
+    		   }
+    		   selectbox[0].selectedIndex = index;
+    		   tripal_analysis_go_org_charts(option.value);
+    	// Otherwise, show the first option by default
+    	   } else {
+    		   selectbox[0].selectedIndex = 1;
+    		   tripal_analysis_go_org_charts(selectbox.val());
+    	   }
        }
    });
 

tripal_analysis_go/tripal_analysis_go.module

@@ -48,6 +48,13 @@ function tripal_analysis_go_menu() {
      'access arguments' => array('access administration pages'),
      'type' => MENU_NORMAL_ITEM,
    );
+   $items['node/%/goterms'] = array(
+     'title' => t('GO Analysis'),
+     'page callback' => 'tripal_analysis_go_organism_goterms',
+     'page arguments' => array(1,3),
+     'access arguments' =>  array('access chado_analysis_go content'),
+     'type' => MENU_CALLBACK
+   );
 
    return $items;
 }
@@ -260,7 +267,9 @@ function tripal_analysis_go_select_form(&$form_state = NULL,$node){
    $analyses = array();
    $analyses[''] = '';
    while($analysis = db_fetch_object($results)){
-      $analyses[$analysis->analysis_id."-".$analysis->organism_id] = "$analysis->name";
+   	if (tripal_analysis_check_permission($analysis->analysis_id)) {
+   		$analyses[$analysis->analysis_id."-".$analysis->organism_id] = "$analysis->name";
+   	}
    }
   
    # create the select box
@@ -379,7 +388,7 @@ function tripal_analysis_go_cv_chart($chart_id){
         )
      ",
      type             => 'p',
-     size             => '550x175',
+     size             => '650x280',
      title            => $title,
   );
   return $options;
@@ -595,3 +604,15 @@ function tripal_analysis_go_job_describe_args($callback,$args){
    }
    return $new_args;
 }
+
+/************************************************************************
+*/
+function tripal_analysis_go_organism_goterms($node, $ana_id_org_id = NULL) {
+	$content = "";
+	if ($ana_id_org_id) {
+		$content .= "<input type=\"hidden\" id=\"analysis_id_for_go_report\" value=\"$ana_id_org_id\">";
+	}
+   $node = node_load($node);
+   $content .= theme('tripal_organism_go_summary', $node);
+   return $content;
+}