From c2ed7b4b15bf6b98bdf8fa613fbac3df73e94986 Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Tue, 11 Jul 2017 09:31:00 -0400 Subject: [PATCH] Use the Entityreference View for the area reference field selection widget. --- ...m_log_activity.features.field_instance.inc | 14 ++++++-- ...farm_log_input.features.field_instance.inc | 14 ++++++-- ...m_log_movement.features.field_instance.inc | 32 ++++++++++++++----- ...og_observation.features.field_instance.inc | 14 ++++++-- ...farm_soil_test.features.field_instance.inc | 14 ++++++-- .../farm_soil_test/farm_soil_test.info | 1 + ...arm_water_test.features.field_instance.inc | 16 +++++++--- .../farm_water_test/farm_water_test.info | 1 + 8 files changed, 82 insertions(+), 24 deletions(-) diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc index b5e86183c..7f59d3300 100644 --- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc +++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc @@ -34,9 +34,17 @@ function farm_log_activity_field_default_field_instances() { ), 'widget' => array( 'active' => 1, - 'module' => 'options', - 'settings' => array(), - 'type' => 'options_select', + 'module' => 'entityreference_view_widget', + 'settings' => array( + 'allow_duplicates' => 0, + 'close_modal' => 1, + 'pass_argument' => 1, + 'pass_arguments' => '', + 'rendered_entity' => 0, + 'view' => 'farm_area_entityreference_view|entityreference_view_widget', + 'view_mode' => 'full', + ), + 'type' => 'entityreference_view_widget', 'weight' => 4, ), ); diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc index fed2f74c2..320036151 100644 --- a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc +++ b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc @@ -40,9 +40,17 @@ function farm_log_input_field_default_field_instances() { ), 'widget' => array( 'active' => 1, - 'module' => 'options', - 'settings' => array(), - 'type' => 'options_select', + 'module' => 'entityreference_view_widget', + 'settings' => array( + 'allow_duplicates' => 0, + 'close_modal' => 1, + 'pass_argument' => 1, + 'pass_arguments' => '', + 'rendered_entity' => 0, + 'view' => 'farm_area_entityreference_view|entityreference_view_widget', + 'view_mode' => 'full', + ), + 'type' => 'entityreference_view_widget', 'weight' => 12, ), ); diff --git a/modules/farm/farm_log/farm_log_movement/farm_log_movement.features.field_instance.inc b/modules/farm/farm_log/farm_log_movement/farm_log_movement.features.field_instance.inc index 98f34b0f3..b4f953e66 100644 --- a/modules/farm/farm_log/farm_log_movement/farm_log_movement.features.field_instance.inc +++ b/modules/farm/farm_log/farm_log_movement/farm_log_movement.features.field_instance.inc @@ -80,7 +80,7 @@ function farm_log_movement_field_default_field_instances() { // 'field_collection_item-field_farm_movement-field_farm_move_from'. $field_instances['field_collection_item-field_farm_movement-field_farm_move_from'] = array( 'bundle' => 'field_farm_movement', - 'default_value' => NULL, + 'default_value' => array(), 'deleted' => 0, 'description' => 'Specify the area(s) that assets are being moved from. This field is optional, and is only used for reference. You may leave this blank as a way of setting initial location. If the assets currently have a location set from a previously logged movement, this field will be automatically filled using that information.', 'display' => array( @@ -101,9 +101,17 @@ function farm_log_movement_field_default_field_instances() { ), 'widget' => array( 'active' => 1, - 'module' => 'options', - 'settings' => array(), - 'type' => 'options_select', + 'module' => 'entityreference_view_widget', + 'settings' => array( + 'allow_duplicates' => 0, + 'close_modal' => 1, + 'pass_argument' => 1, + 'pass_arguments' => '', + 'rendered_entity' => 0, + 'view' => 'farm_area_entityreference_view|entityreference_view_widget', + 'view_mode' => 'full', + ), + 'type' => 'entityreference_view_widget', 'weight' => 4, ), ); @@ -112,7 +120,7 @@ function farm_log_movement_field_default_field_instances() { // 'field_collection_item-field_farm_movement-field_farm_move_to'. $field_instances['field_collection_item-field_farm_movement-field_farm_move_to'] = array( 'bundle' => 'field_farm_movement', - 'default_value' => NULL, + 'default_value' => array(), 'deleted' => 0, 'description' => 'Specify the area(s) that assets are being moved to. If you need to specify more precise locations (in addition to these areas), use the Geometry field below.', 'display' => array( @@ -133,9 +141,17 @@ function farm_log_movement_field_default_field_instances() { ), 'widget' => array( 'active' => 1, - 'module' => 'options', - 'settings' => array(), - 'type' => 'options_select', + 'module' => 'entityreference_view_widget', + 'settings' => array( + 'allow_duplicates' => 0, + 'close_modal' => 1, + 'pass_argument' => 1, + 'pass_arguments' => '', + 'rendered_entity' => 0, + 'view' => 'farm_area_entityreference_view|entityreference_view_widget', + 'view_mode' => 'full', + ), + 'type' => 'entityreference_view_widget', 'weight' => 2, ), ); diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc index d420ecc2c..32940268f 100644 --- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc +++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc @@ -34,9 +34,17 @@ function farm_log_observation_field_default_field_instances() { ), 'widget' => array( 'active' => 1, - 'module' => 'options', - 'settings' => array(), - 'type' => 'options_select', + 'module' => 'entityreference_view_widget', + 'settings' => array( + 'allow_duplicates' => 0, + 'close_modal' => 1, + 'pass_argument' => 1, + 'pass_arguments' => '', + 'rendered_entity' => 0, + 'view' => 'farm_area_entityreference_view|entityreference_view_widget', + 'view_mode' => 'full', + ), + 'type' => 'entityreference_view_widget', 'weight' => 3, ), ); diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc index d8503f482..4e0c44c79 100644 --- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc +++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc @@ -34,9 +34,17 @@ function farm_soil_test_field_default_field_instances() { ), 'widget' => array( 'active' => 1, - 'module' => 'options', - 'settings' => array(), - 'type' => 'options_select', + 'module' => 'entityreference_view_widget', + 'settings' => array( + 'allow_duplicates' => 0, + 'close_modal' => 1, + 'pass_argument' => 1, + 'pass_arguments' => '', + 'rendered_entity' => 0, + 'view' => 'farm_area_entityreference_view|entityreference_view_widget', + 'view_mode' => 'full', + ), + 'type' => 'entityreference_view_widget', 'weight' => 2, ), ); diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info index 2f6ceed28..aa6892837 100644 --- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info +++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info @@ -7,6 +7,7 @@ dependencies[] = ctools dependencies[] = date dependencies[] = entity dependencies[] = entityreference +dependencies[] = entityreference_view_widget dependencies[] = farm_area dependencies[] = farm_fields dependencies[] = farm_map diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc b/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc index 34ec90257..9f83af796 100644 --- a/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc +++ b/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc @@ -13,7 +13,7 @@ function farm_water_test_field_default_field_instances() { // Exported field_instance: 'log-farm_water_test-field_farm_area'. $field_instances['log-farm_water_test-field_farm_area'] = array( 'bundle' => 'farm_water_test', - 'default_value' => NULL, + 'default_value' => array(), 'deleted' => 0, 'description' => 'What areas were this water sample taken from?', 'display' => array( @@ -34,9 +34,17 @@ function farm_water_test_field_default_field_instances() { ), 'widget' => array( 'active' => 1, - 'module' => 'options', - 'settings' => array(), - 'type' => 'options_select', + 'module' => 'entityreference_view_widget', + 'settings' => array( + 'allow_duplicates' => 0, + 'close_modal' => 1, + 'pass_argument' => 1, + 'pass_arguments' => '', + 'rendered_entity' => 0, + 'view' => 'farm_area_entityreference_view|entityreference_view_widget', + 'view_mode' => 'full', + ), + 'type' => 'entityreference_view_widget', 'weight' => 7, ), ); diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.info b/modules/farm/farm_water/farm_water_test/farm_water_test.info index 4ee6c9417..f93d38d62 100644 --- a/modules/farm/farm_water/farm_water_test/farm_water_test.info +++ b/modules/farm/farm_water/farm_water_test/farm_water_test.info @@ -6,6 +6,7 @@ dependencies[] = colorbox dependencies[] = ctools dependencies[] = entity dependencies[] = entityreference +dependencies[] = entityreference_view_widget dependencies[] = farm_area dependencies[] = farm_fields dependencies[] = farm_water