Merge branch '7.x-3.x' of github.com:tripal/tripal into 7.x-3.x

tripal/tripal.info

@@ -12,6 +12,7 @@ scripts[]          = theme/js/tripal.js
 files[] = views_handlers/tripal_views_handler_filter_string_selectbox.inc
 files[] = views_handlers/tripal_views_handler_field_entity.inc
 files[] = views_handlers/tripal_views_handler_field_entity_status.inc
+files[] = views_handlers/tripal_views_handler_field_entity_default_formatter.inc
 files[] = tripal_views_query.inc
 
 dependencies[] = views

tripal/tripal.views.inc

@@ -68,14 +68,17 @@ function tripal_entity_views_data() {
       // fields should set their type and here we use that type to determine
       // which handler to use. If not handler is specified then we use
       // a default string handler.
-      $field_handler = 'views_handler_field';
+      $field_handler = 'tripal_views_handler_field_entity_default_formatter';
       $filter_handler = 'views_handler_filter';
       $sort_handler = 'views_handler_sort';
       $click_sortable = TRUE;
 
       $field_name = $instance['field_name'];
 
-      if ($field_name == 'feature__organism_id') {
+      if ($field_name == 'content_type') {
+        $field_handler = 'views_handler_field';
+      }
+      else if ($field_name == 'feature__organism_id') {
         $field_handler = 'chado_views_handler_field_chado_base__organism_id';
       }
 

tripal/tripal_views_query.inc

@@ -53,7 +53,10 @@ class tripal_views_query extends views_plugin_query {
         field_attach_load($entity->type, array($entity->id => $entity), FIELD_LOAD_CURRENT,
             array('field_id' => $field['id']));
         $items = field_get_items('TripalEntity', $entity, $field_name);
-        $row->$field_name = $items[0]['value'];
+        //$row->$field_name = field_view_field('TripalEntity', $entity, $field_name);
+        $value = $items[0]['value'];
+        $row->entity = $entity;
+        $row->$field_name = $value;
       }
 
       // Add the row to the results list.