tripal_analysis_blast/parse_blast_XML.inc

@@ -414,6 +414,7 @@ function tripal_analysis_blast_get_result_object($xml_string,$db,$max,$feature_i
 
 	// Get analysis information
 	$blast_object->analysis = $analysis;
+	$db->displayname = $db_name;
 	$blast_object->db = $db;
 	if (!$db_name) {
 		$blast_object->title = $analysis->name;

tripal_analysis_blast/theme/tripal_feature/tripal_feature_blast_results.tpl.php

@@ -17,7 +17,7 @@ if(count($blast_results_list) > 0){
 ?>
 <div id="blast_db_<?php print $db->db_id ?>">
 <div id="tripal_analysis_blast-results-<?php print "$db->db_id" ?>-box" class="tripal_analysis_blast-box tripal-info-box">
-	<div class="tripal-info-box-title tripal_analysis_blast-info-box-title"><?php print $db->name ?> Homologs</div>
+	<div class="tripal-info-box-title tripal_analysis_blast-info-box-title"><?php if ($db->displayname) {print $db->displayname;} else {print $db->name . "Homologs";} ?></div>
 	<div class="tripal-info-box-desc tripal_analysis_blast-info-box-desc">
 	<strong>Analysis Date: </strong><?php print preg_replace("/^(\d+-\d+-\d+) .*/","$1",$analysis->timeexecuted) . " (<a href=".url("node/$analysis->nid").">$analysis->name</a>)"?><br>
 	<!--Query: <?php print "$blast_result->xml_tag"?><br>-->

tripal_analysis_blast/tripal_analysis_blast.module

@@ -834,7 +834,7 @@ function chado_analysis_blast_access($op, $node, $account){
 		}
 	}
 	if ($op == 'view') {
-		if (user_access('access chado_analysis_blast content', $account)) {
+		if (user_access('access chado_analysis_blast content', $account) && tripal_check_permission_by_node_id($node->nid)) {
 			return TRUE;
 		}
 	}

tripal_analysis_blast/tripal_analysis_blast_htmlreport.inc

@@ -1,7 +1,10 @@
 <?php
 
 function tripal_get_blast_report ($analysis_id, $currentpage, $sort, $descending, $per_page) {
-
+	if (!tripal_analysis_check_permission($analysis_id)) {
+		$html_out = "Access denied. You are not authorized to access this report.";
+		return $html_out;
+	}
 	$report_object = new stdClass;
 	
 	$symbol = "&and;";