Browse Source

Tripal: Bug fixes for using Drupal views when chado is in an external database

laceysanderson 13 years ago
parent
commit
032c2370f8

+ 1 - 1
tripal_analysis/views/analysis.views.inc

@@ -47,7 +47,7 @@ function retrieve_analysis_views_data() {
  		'help' => t("An analysis is a particular type of a computational analysis; it may be a blast of one sequence against another, or an all by all blast, or a different kind of analysis altogether. It is a single unit of computation."),
  	);
   if($database){
-     $data['analysis']['table']['database'] = $database;
+     $data['analysis']['table']['base']['database'] = $database;
   }
 
   // Define relationships between this table and others

+ 1 - 1
tripal_cv/tripal_cv.views.inc

@@ -55,7 +55,7 @@ function tripal_cv_views_handlers() {
  );
 }
 
-function tripal_genetic_views_default_views () {
+function tripal_cv_views_default_views () {
   $views = array();
   
   // Main default view

+ 2 - 1
tripal_feature/views/feature.views.inc

@@ -56,8 +56,9 @@
    );
 
 	if($database){
-		$data['feature']['table']['database'] = $database;
+		$data['feature']['table']['base']['database'] = $database;
 	}
+	
 
   //Relationship Definitions---------------------------------
   //Join: feature => nd_reagent

+ 1 - 1
tripal_library/views/library.views.inc

@@ -45,7 +45,7 @@ function retrieve_library_views_data() {
 	  'help' => 'Library existing in the Chado Database',                                                                                                                                                                          
 	);
 	if($database){
-	  $data['library']['table']['database'] = $database;
+	  $data['library']['table']['base']['database'] = $database;
 	}
 	
 	// Define relationships between this table and others

+ 1 - 1
tripal_organism/views/organism.views.inc

@@ -42,7 +42,7 @@ function retrieve_organism_views_data() {
     'help' => 'Organisms existing in the Chado Database',                                                                                                                                                                          
   );
   if($database){
-     $data['organism']['table']['database'] = $database;
+     $data['organism']['table']['base']['database'] = $database;
   }
 
   // Define relationships between this table and others

+ 0 - 17
tripal_stock/tripal_stock.views.inc

@@ -463,23 +463,6 @@ function tripal_stock_views_default_views() {
       'field' => 'name',
       'relationship' => 'none',
     ),
-    'status' => array(
-      'operator' => '=',
-      'value' => '1',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
-        'operator' => FALSE,
-        'label' => '',
-      ),
-      'id' => 'status',
-      'table' => 'node',
-      'field' => 'status',
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-    ),
   ));
   $handler->override_option('access', array(
     'type' => 'perm',

+ 1 - 1
tripal_stock/views/stock.views.inc

@@ -50,7 +50,7 @@ function retrieve_stock_views_data() {
     'help' => t('Chado Stocks are a record of any material upon which an experiment can be done. For example, a DNA sample, an individual or a population.'),
   );
   if($database){
-     $data['stock']['table']['database'] = $database;
+     $data['stock']['table']['base']['database'] = $database;
   }
 
 	// Define relationships between this table and others