Browse Source

remove dpms

bradfordcondon 7 years ago
parent
commit
8c40445483

+ 5 - 3
tripal_chado/includes/TripalFields/sep__protocol/sep__protocol.inc

@@ -128,14 +128,16 @@ class sep__protocol extends ChadoField {
     $field_column = $this->instance['settings']['chado_column'];
     $linker_field = 'chado-' . $field_table . '__protocol_id';
 
-    $protocol_id = $record->protocol_id;
-    $protocol_name = $record->name;
+    $protocol_id = $record->protocol_id->protocol_id;
+    $protocol_name = $record->protocol_id->name;
+
+    $entity_id = $record->entity_id;
 
     $entity->{$field_name}['und'][0]['value'] = array(
      "protocol_id" => $protocol_id,
       "protocol_name" => $protocol_name,
+      "entity_id" => $entity_id,
       "full_record" => $record,
-      "field" => $this->field,
       "instance" => $this->instance
     );
 

+ 1 - 3
tripal_chado/includes/TripalFields/sep__protocol/sep__protocol_formatter.inc

@@ -82,12 +82,10 @@ class sep__protocol_formatter extends ChadoFieldFormatter {
    */
   public function view(&$element, $entity_type, $entity, $langcode, $items, $display) {
 
-    dpm($items);
     $protocol_id = $items[0]['value']["protocol_id"];
     $protocol_name = $items[0]['value']["protocol_name"];
-    $entity_id = $items[0]['value']["entity_id"];
     $content = $protocol_name;
-
+    list($entity_type, $entity_id) = explode(':', $items[0]['value']['entity_id']);
     if ($entity_id) {
       $content = l($protocol_name, 'bio_data/' . $entity_id);
     }

+ 0 - 4
tripal_chado/includes/TripalFields/sep__protocol/sep__protocol_widget.inc

@@ -82,9 +82,6 @@ class sep__protocol_widget extends ChadoFieldWidget {
     $field_column = $this->instance['settings']['chado_column'];
     $linker_field = 'chado-' . $field_table . '__protocol_id';
 
-    dpm($this->field);
-    dpm($this->instance);
-
     $protocols = [];
     //options are all protocols
     //It could be argued that options should only be protocols where protocol_type matches the bundle base table.
@@ -119,7 +116,6 @@ class sep__protocol_widget extends ChadoFieldWidget {
    */
   public function validate($element, $form, &$form_state, $langcode, $delta) {
 
-    dpm($form_state);
   }
 
   /**