Fix "Owner" field in Views so that it shows multiple owners.

modules/farm/farm_crop/farm_crop.views_default.inc

@@ -226,7 +226,7 @@ function farm_crop_views_default_views() {
     'field_farm_move_to' => 'field_farm_move_to',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name' => 'name',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -299,9 +299,7 @@ function farm_crop_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -443,13 +441,15 @@ function farm_crop_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name']['id'] = 'name';
-  $handler->display->display_options['fields']['name']['table'] = 'users';
-  $handler->display->display_options['fields']['name']['field'] = 'name';
-  $handler->display->display_options['fields']['name']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';
@@ -671,7 +671,7 @@ function farm_crop_views_default_views() {
     'field_farm_move_to' => 'field_farm_move_to',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name' => 'name',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -744,9 +744,7 @@ function farm_crop_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -888,13 +886,15 @@ function farm_crop_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name']['id'] = 'name';
-  $handler->display->display_options['fields']['name']['table'] = 'users';
-  $handler->display->display_options['fields']['name']['field'] = 'name';
-  $handler->display->display_options['fields']['name']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_equipment/farm_equipment.views_default.inc

@@ -371,7 +371,7 @@ function farm_equipment_views_default_views() {
     'field_farm_asset' => 'field_farm_asset',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name_1' => 'name_1',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -425,9 +425,7 @@ function farm_equipment_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -535,13 +533,15 @@ function farm_equipment_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
-  $handler->display->display_options['fields']['name_1']['table'] = 'users';
-  $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name_1']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_livestock/farm_livestock.views_default.inc

@@ -825,7 +825,7 @@ function farm_livestock_views_default_views() {
     'field_farm_asset' => 'field_farm_asset',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name_1' => 'name_1',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -879,9 +879,7 @@ function farm_livestock_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -989,13 +987,15 @@ function farm_livestock_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
-  $handler->display->display_options['fields']['name_1']['table'] = 'users';
-  $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name_1']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.views_default.inc

@@ -46,7 +46,7 @@ function farm_livestock_eggs_views_default_views() {
     'field_farm_animal_group' => 'field_farm_animal_group',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name' => 'name',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -107,9 +107,7 @@ function farm_livestock_eggs_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -224,13 +222,15 @@ function farm_livestock_eggs_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name']['id'] = 'name';
-  $handler->display->display_options['fields']['name']['table'] = 'users';
-  $handler->display->display_options['fields']['name']['field'] = 'name';
-  $handler->display->display_options['fields']['name']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_log/farm_log.views_default.inc

@@ -271,7 +271,7 @@ function farm_log_views_default_views() {
     'field_farm_area' => 'field_farm_area',
     'type' => 'type',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name_1' => 'name_1',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -330,9 +330,7 @@ function farm_log_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -440,13 +438,15 @@ function farm_log_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
-  $handler->display->display_options['fields']['name_1']['table'] = 'users';
-  $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name_1']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_log/farm_log_activity/farm_log_activity.views_default.inc

@@ -46,7 +46,7 @@ function farm_log_activity_views_default_views() {
     'field_farm_area' => 'field_farm_area',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name_1' => 'name_1',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -105,9 +105,7 @@ function farm_log_activity_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -218,13 +216,15 @@ function farm_log_activity_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
-  $handler->display->display_options['fields']['name_1']['table'] = 'users';
-  $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name_1']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc

@@ -49,7 +49,7 @@ function farm_log_harvest_views_default_views() {
     'field_farm_lot_number' => 'field_farm_lot_number',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name_1' => 'name_1',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -129,9 +129,7 @@ function farm_log_harvest_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -271,13 +269,15 @@ function farm_log_harvest_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
-  $handler->display->display_options['fields']['name_1']['table'] = 'users';
-  $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name_1']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_log/farm_log_input/farm_log_input.views_default.inc

@@ -48,7 +48,7 @@ function farm_log_input_views_default_views() {
     'field_farm_area' => 'field_farm_area',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name_1' => 'name_1',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -121,9 +121,7 @@ function farm_log_input_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -258,13 +256,15 @@ function farm_log_input_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
-  $handler->display->display_options['fields']['name_1']['table'] = 'users';
-  $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name_1']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_log/farm_log_movement/farm_log_movement.views_default.inc

@@ -419,6 +419,7 @@ function farm_log_movement_views_default_views() {
     'name' => 'name',
     'type' => 'type',
     'field_farm_log_category' => 'field_farm_log_category',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -477,6 +478,11 @@ function farm_log_movement_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
+    'field_farm_log_owner' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
   );
   $handler->display->display_options['style_options']['empty_table'] = TRUE;
   /* Header: Global: Unfiltered text */
@@ -589,6 +595,15 @@ function farm_log_movement_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';
@@ -752,6 +767,7 @@ function farm_log_movement_views_default_views() {
     t('Movement to'),
     t('Log type'),
     t('Categories'),
+    t('Owner'),
     t('All'),
     t('%1\'s movements'),
     t('Area'),

modules/farm/farm_log/farm_log_observation/farm_log_observation.views_default.inc

@@ -49,7 +49,7 @@ function farm_log_observation_views_default_views() {
     'field_farm_quantity_units' => 'field_farm_quantity_units',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name_1' => 'name_1',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -127,9 +127,7 @@ function farm_log_observation_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -275,13 +273,15 @@ function farm_log_observation_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
-  $handler->display->display_options['fields']['name_1']['table'] = 'users';
-  $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name_1']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc

@@ -52,6 +52,7 @@ function farm_log_sale_views_default_views() {
     'field_farm_total_price' => 'field_farm_total_price',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -154,6 +155,11 @@ function farm_log_sale_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
+    'field_farm_log_owner' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
   );
   $handler->display->display_options['style_options']['empty_table'] = TRUE;
   /* No results behavior: Global: Unfiltered text */
@@ -307,6 +313,15 @@ function farm_log_sale_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';
@@ -456,6 +471,7 @@ function farm_log_sale_views_default_views() {
     t('Total price'),
     t('Notes'),
     t('Categories'),
+    t('Owner'),
     t('All'),
     t('%1\'s sales'),
     t('Start date'),

modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc

@@ -46,7 +46,7 @@ function farm_soil_test_views_default_views() {
     'field_farm_area' => 'field_farm_area',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name_1' => 'name_1',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -107,9 +107,7 @@ function farm_soil_test_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -219,13 +217,15 @@ function farm_soil_test_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
-  $handler->display->display_options['fields']['name_1']['table'] = 'users';
-  $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name_1']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';

modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc

@@ -46,7 +46,7 @@ function farm_water_test_views_default_views() {
     'field_farm_water_lab' => 'field_farm_water_lab',
     'field_farm_notes' => 'field_farm_notes',
     'field_farm_log_category' => 'field_farm_log_category',
-    'name_1' => 'name_1',
+    'field_farm_log_owner' => 'field_farm_log_owner',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -107,9 +107,7 @@ function farm_water_test_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'name_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'field_farm_log_owner' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -218,13 +216,15 @@ function farm_water_test_views_default_views() {
   $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Categories';
   $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
   $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
-  /* Field: User: Name */
-  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
-  $handler->display->display_options['fields']['name_1']['table'] = 'users';
-  $handler->display->display_options['fields']['name_1']['field'] = 'name';
-  $handler->display->display_options['fields']['name_1']['relationship'] = 'field_farm_log_owner_target_id';
-  $handler->display->display_options['fields']['name_1']['label'] = 'Owner';
-  $handler->display->display_options['fields']['name_1']['link_to_user'] = FALSE;
+  /* Field: Log: Owner */
+  $handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['table'] = 'field_data_field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['field'] = 'field_farm_log_owner';
+  $handler->display->display_options['fields']['field_farm_log_owner']['settings'] = array(
+    'bypass_access' => 0,
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0';
   /* Sort criterion: Log: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'log';