Browse Source

Fixed minor bug and adjusted module dependencies

Stephen Ficklin 9 years ago
parent
commit
0bdff6bf39

+ 4 - 9
tripal_chado/includes/tripal_chado.entity.inc

@@ -24,15 +24,10 @@ function tripal_chado_entity_postsave($entity, $type) {
  * Implements hook_entity_load().
  */
 function tripal_chado_entity_load($entities, $type) {
-  dpm($entities);
-
-  // Set some information about the entity about it's Chado record.
-  foreach ($entities as $entity) {
-    dpm($entity->type);
-    if ($entity->type == 'TripalEntity') {
-
-    }
-  }
+ // TODO: we should add the cvterm record and the Chado record to the
+ // entity.  This way the kvproperty field (or any other's we add in the
+ // future do not need to load all of that information.  This can create
+ // multiple loading of the same records all over the place.
 }
 
 /**

+ 1 - 1
tripal_chado/includes/tripal_chado.term_storage.inc

@@ -46,7 +46,7 @@ function tripal_chado_vocab_get_term($namespace, $term_id) {
   if (!$cvterm) {
     return NULL;
   }
-  $cvterm = chado_expand_var($cvterm, 'field', 'cveterm.definition');
+  $cvterm = chado_expand_var($cvterm, 'field', 'cvterm.definition');
   return array(
     'id' => $cvterm->dbxref_id->accession,
     'name' => $cvterm->name,

+ 2 - 0
tripal_chado/tripal_chado.info

@@ -9,4 +9,6 @@ stylesheets[all][] = theme/css/tripal_chado.css
 
 dependencies[] = tripal_core
 dependencies[] = tripal_entities
+dependencies[] = tripal_db
+dependencies[] = tripal_cv
 dependencies[] = date

+ 0 - 3
tripal_entities/tripal_entities.info

@@ -7,6 +7,3 @@ version = 7.x-2.0
 
 dependencies[] = date
 dependencies[] = entity
-dependencies[] = tripal_core
-dependencies[] = tripal_db
-dependencies[] = tripal_cv