Fixed a few minor bugs

legacy/tripal_core/tripal_core.install

@@ -49,10 +49,10 @@ function tripal_core_uninstall() {
 
   // drop the foreign key between tripal_custom_tables and tripal_mviews
   // so that Drupal can then drop the tables
-  db_query('
-    ALTER TABLE {tripal_custom_tables}
-    DROP CONSTRAINT tripal_custom_tables_fk1 CASCADE
-  ');
+//   db_query('
+//     ALTER TABLE {tripal_custom_tables}
+//     DROP CONSTRAINT tripal_custom_tables_fk1 CASCADE
+//   ');
 }
 
 /**

tripal_chado/api/modules/tripal_chado.cv.api.inc

@@ -917,7 +917,7 @@ function tripal_autocomplete_cvterm($cv_id, $string = '') {
   // in the results.
   else {
     $sql = "
-      SELECT CVT.cvterm_id, CVT.name
+      SELECT CVT.cvterm_id, CVT.name, CV.name as cvname, CVT.cv_id
       FROM {cvterm} CVT
         INNER JOIN {cv} CV on CVT.cv_id = CV.cv_id
       WHERE lower(CVT.name) like lower(:name)

tripal_chado/tripal_chado.module

@@ -1910,7 +1910,6 @@ function tripal_chado_entity_property_get_value($entity, $options, $field_name,
  * Remove the nid from chado_entity if it exists when the node is deleted
  */
 function tripal_chado_node_delete($node) {
-  dpm($node);
   $nid = $node->nid;
   $sql = "UPDATE chado_entity SET nid = NULL WHERE nid = :nid";
   db_query($sql, array('nid' => $nid));