Przeglądaj źródła

Fixed DB Views accession link (no longer empty if no urlprefix-now displays unlinked accession) and added relationship so you can view the db name (and any other db field) in stock, feature and cvterm views

laceysanderson 14 lat temu
rodzic
commit
4a9ec0135f

+ 2 - 2
tripal_core/views_handlers/views_handler_field_dbxref_accession_link.inc

@@ -28,10 +28,10 @@ class views_handler_field_dbxref_accession_link extends views_handler_field {
        $accession_link = $urlprefix . $accession;
        return($accession_link); 
      } else {
-       return '';
+       return $accession;
      }
    } else {
-     return '';
+     return $accession;
    }
  } 
 } 

+ 15 - 0
tripal_db/views/db.views.inc

@@ -35,6 +35,21 @@ function retrieve_db_views_data() {
       'left_field' => 'db_id',
       'field' => 'db_id',
     ),
+    'stock' => array(
+    	'left_table' => 'dbxref',
+    	'left_field' => 'db_id',
+    	'field' => 'db_id',
+    ),
+    'cvterm' => array(
+    	'left_table' => 'dbxref',
+    	'left_field' => 'db_id',
+    	'field' => 'db_id',
+    ),
+    'feature' => array(
+    	'left_table' => 'dbxref',
+    	'left_field' => 'db_id',
+    	'field' => 'db_id',
+    ),
   );
   
   // Table Field Definitions----------------------

+ 2 - 2
tripal_db/views/dbxref.views.inc

@@ -43,7 +43,7 @@ function retrieve_dbxref_views_data() {
     'stock' => array(
       'left_field' => 'dbxref_id',
       'field' => 'dbxref_id',
-    ),     
+    ),  
   );
 
   // Table Field Definitions----------------------
@@ -120,7 +120,7 @@ function retrieve_dbxref_views_data() {
     ),
   );
 
-  // Calculated Field: Accession Link (varchar 1024)
+  // Calculated Field: Accession Link
   //  uses custom field handler to pull db urlprefix and concatenate with accession
   //  solves the problem of not being able to add urlprefix to tables which only
   //  join to dbxref table (not db)

+ 3 - 5
tripal_stock/views/stock.views.inc

@@ -46,11 +46,9 @@ function retrieve_stock_views_data() {
       'left_field' => 'organism_id',
       'field' => 'organism_id',
     ),
-    'dbxref' => array(
-     'left_field' => 'dbxref_id',                                                                                                                                                                                                   
-      'field' => 'dbxref_id',
-    ),
-  );  
+  ); 
+  
+  
 
 	// Table Field Definitions----------------------
   // Field: feature_id (primary key)