OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Change "Owner" to "Assigned to" in log field instances and views.

This commit is contained in:
Michael Stenta 2017-09-04 10:58:25 -04:00
parent 82d29d81dd
commit cb2e8716e3
24 changed files with 75 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/farm/farm_crop/farm_crop.features.field_instance.inc
View File

@ -416,7 +416,7 @@ function farm_crop_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -742,7 +742,7 @@ function farm_crop_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -1062,6 +1062,7 @@ function farm_crop_field_default_field_instances() {
// Translatables // Translatables
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Assign this planting to a season. You can manage these options in the ' . l('Seasons', 'admin/structure/taxonomy/farm_season') . ' vocabulary.'); t('Assign this planting to a season. You can manage these options in the ' . l('Seasons', 'admin/structure/taxonomy/farm_season') . ' vocabulary.');
t('Assigned to');
t('Companions'); t('Companions');
t('Crop family'); t('Crop family');
t('Crop/variety'); t('Crop/variety');
@ -1076,7 +1077,6 @@ function farm_crop_field_default_field_instances() {
t('Movement'); t('Movement');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Parent(s)'); t('Parent(s)');
t('Photos'); t('Photos');
t('Planting'); t('Planting');

14
modules/farm/farm_crop/farm_crop.views_default.inc
View File

@ -454,7 +454,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -481,7 +481,7 @@ function farm_crop_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Assets (field_farm_asset) */ /* Contextual filter: Log: Assets (field_farm_asset) */
$handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id';
$handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset';
@ -514,7 +514,7 @@ function farm_crop_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -637,6 +637,7 @@ function farm_crop_views_default_views() {
t('Movement to'), t('Movement to'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Seedings of %1'), t('Seedings of %1'),
t('Start date'), t('Start date'),
@ -912,7 +913,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -939,7 +940,7 @@ function farm_crop_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Assets (field_farm_asset) */ /* Contextual filter: Log: Assets (field_farm_asset) */
$handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id';
$handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset';
@ -972,7 +973,7 @@ function farm_crop_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -1095,6 +1096,7 @@ function farm_crop_views_default_views() {
t('Movement to'), t('Movement to'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Transplantings of %1'), t('Transplantings of %1'),
t('Start date'), t('Start date'),

4
modules/farm/farm_equipment/farm_equipment.features.field_instance.inc
View File

@ -414,7 +414,7 @@ function farm_equipment_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -498,6 +498,7 @@ function farm_equipment_field_default_field_instances() {
// Translatables // Translatables
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Assets'); t('Assets');
t('Assigned to');
t('Description'); t('Description');
t('Files'); t('Files');
t('Log category'); t('Log category');
@ -506,7 +507,6 @@ function farm_equipment_field_default_field_instances() {
t('Movement'); t('Movement');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Photos'); t('Photos');
t('Serial number'); t('Serial number');
t('Use these fields to record a movement with this log entry. This will be used to define the location of any referenced assets. The current location of any asset is determined by the most recently completed movement log. Only the "to" field is required.'); t('Use these fields to record a movement with this log entry. This will be used to define the location of any referenced assets. The current location of any asset is determined by the most recently completed movement log. Only the "to" field is required.');

7
modules/farm/farm_equipment/farm_equipment.views_default.inc
View File

@ -546,7 +546,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -573,7 +573,7 @@ function farm_equipment_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Assets (field_farm_asset) */ /* Contextual filter: Log: Assets (field_farm_asset) */
$handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id';
$handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset';
@ -603,7 +603,7 @@ function farm_equipment_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -721,6 +721,7 @@ function farm_equipment_views_default_views() {
t('Assets'), t('Assets'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Maintenance of %1'), t('Maintenance of %1'),
t('Start date'), t('Start date'),

4
modules/farm/farm_livestock/farm_livestock.features.field_instance.inc
View File

@ -709,7 +709,7 @@ function farm_livestock_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -794,6 +794,7 @@ function farm_livestock_field_default_field_instances() {
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Animals'); t('Animals');
t('Assign this animal to a particular group, herd, flock, etc. You can manage the list of available groups in the ' . l('Animal Groups', 'farm/assets/animals/groups') . ' vocabulary.'); t('Assign this animal to a particular group, herd, flock, etc. You can manage the list of available groups in the ' . l('Animal Groups', 'farm/assets/animals/groups') . ' vocabulary.');
t('Assigned to');
t('Body Location'); t('Body Location');
t('Castrated'); t('Castrated');
t('Date of birth'); t('Date of birth');
@ -810,7 +811,6 @@ function farm_livestock_field_default_field_instances() {
t('Nickname(s)'); t('Nickname(s)');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Parent(s)'); t('Parent(s)');
t('Photos'); t('Photos');
t('Sex'); t('Sex');

7
modules/farm/farm_livestock/farm_livestock.views_default.inc
View File

@ -1000,7 +1000,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -1027,7 +1027,7 @@ function farm_livestock_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Assets (field_farm_asset) */ /* Contextual filter: Log: Assets (field_farm_asset) */
$handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id';
$handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset';
@ -1057,7 +1057,7 @@ function farm_livestock_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -1175,6 +1175,7 @@ function farm_livestock_views_default_views() {
t('Assets'), t('Assets'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Medical records for %1'), t('Medical records for %1'),
t('Start date'), t('Start date'),

4
modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.features.field_instance.inc
View File

@ -135,7 +135,7 @@ function farm_livestock_eggs_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -185,12 +185,12 @@ function farm_livestock_eggs_field_default_field_instances() {
// Translatables // Translatables
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Assigned to');
t('Group'); t('Group');
t('How many eggs were collected?'); t('How many eggs were collected?');
t('Log category'); t('Log category');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Quantity'); t('Quantity');
t('Use this to organize your logs into categories for easier searching and filtering later.'); t('Use this to organize your logs into categories for easier searching and filtering later.');
t('What group/flock were these eggs collected from?'); t('What group/flock were these eggs collected from?');

7
modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.views_default.inc
View File

@ -235,7 +235,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -262,7 +262,7 @@ function farm_livestock_eggs_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Filter criterion: Log: Log type */ /* Filter criterion: Log: Log type */
$handler->display->display_options['filters']['type']['id'] = 'type'; $handler->display->display_options['filters']['type']['id'] = 'type';
$handler->display->display_options['filters']['type']['table'] = 'log'; $handler->display->display_options['filters']['type']['table'] = 'log';
@ -280,7 +280,7 @@ function farm_livestock_eggs_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -413,6 +413,7 @@ function farm_livestock_eggs_views_default_views() {
t('Group'), t('Group'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('Start date'), t('Start date'),
t('End date'), t('End date'),
t('Page'), t('Page'),

7
modules/farm/farm_log/farm_log.views_default.inc
View File

@ -451,7 +451,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -478,7 +478,7 @@ function farm_log_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Filter criterion: Log: Name */ /* Filter criterion: Log: Name */
$handler->display->display_options['filters']['name']['id'] = 'name'; $handler->display->display_options['filters']['name']['id'] = 'name';
$handler->display->display_options['filters']['name']['table'] = 'log'; $handler->display->display_options['filters']['name']['table'] = 'log';
@ -499,7 +499,7 @@ function farm_log_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log type */ /* Filter criterion: Log: Log type */
@ -1195,6 +1195,7 @@ function farm_log_views_default_views() {
t('Areas'), t('Areas'),
t('Log type'), t('Log type'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('Search'), t('Search'),
t('Start date'), t('Start date'),
t('End date'), t('End date'),

4
modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
View File

@ -282,7 +282,7 @@ function farm_log_activity_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -367,13 +367,13 @@ function farm_log_activity_field_default_field_instances() {
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Areas'); t('Areas');
t('Assets'); t('Assets');
t('Assigned to');
t('Files'); t('Files');
t('Geometry'); t('Geometry');
t('Log category'); t('Log category');
t('Movement'); t('Movement');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Photos'); t('Photos');
t('This field is optional. It allows you to store geospatial data along with this activity.'); t('This field is optional. It allows you to store geospatial data along with this activity.');
t('Use these fields to record a movement with this log entry. This will be used to define the location of any referenced assets. The current location of any asset is determined by the most recently completed movement log. Only the "to" field is required.'); t('Use these fields to record a movement with this log entry. This will be used to define the location of any referenced assets. The current location of any asset is determined by the most recently completed movement log. Only the "to" field is required.');

7
modules/farm/farm_log/farm_log_activity/farm_log_activity.views_default.inc
View File

@ -229,7 +229,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -256,7 +256,7 @@ function farm_log_activity_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Assets (field_farm_asset) */ /* Contextual filter: Log: Assets (field_farm_asset) */
$handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id';
$handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset';
@ -312,7 +312,7 @@ function farm_log_activity_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -431,6 +431,7 @@ function farm_log_activity_views_default_views() {
t('Areas'), t('Areas'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Activities of %1'), t('Activities of %1'),
t('Activities in %2'), t('Activities in %2'),

4
modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
View File

@ -305,7 +305,7 @@ function farm_log_harvest_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -469,6 +469,7 @@ function farm_log_harvest_field_default_field_instances() {
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Areas'); t('Areas');
t('Assets'); t('Assets');
t('Assigned to');
t('Describe the quantity of this harvest, using a value and a unit of measurement. For example, if you harvested 100 pounds of potatoes, enter "100" in the Value field, and "lbs" in the Units field. As you type the unit, you will have the option of selecting from units that you\'ve entered in the past.'); t('Describe the quantity of this harvest, using a value and a unit of measurement. For example, if you harvested 100 pounds of potatoes, enter "100" in the Value field, and "lbs" in the Units field. As you type the unit, you will have the option of selecting from units that you\'ve entered in the past.');
t('Files'); t('Files');
t('Geometry'); t('Geometry');
@ -478,7 +479,6 @@ function farm_log_harvest_field_default_field_instances() {
t('Movement'); t('Movement');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Photos'); t('Photos');
t('Quantity'); t('Quantity');
t('This field is optional. It allows you to store geospatial data along with this harvest.'); t('This field is optional. It allows you to store geospatial data along with this harvest.');

7
modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc
View File

@ -282,7 +282,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -309,7 +309,7 @@ function farm_log_harvest_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Assets (field_farm_asset) */ /* Contextual filter: Log: Assets (field_farm_asset) */
$handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id';
$handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset';
@ -349,7 +349,7 @@ function farm_log_harvest_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -472,6 +472,7 @@ function farm_log_harvest_views_default_views() {
t('Harvest lot number'), t('Harvest lot number'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Harvests of %1'), t('Harvests of %1'),
t('Lot number'), t('Lot number'),

4
modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
View File

@ -480,7 +480,7 @@ function farm_log_input_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -685,6 +685,7 @@ function farm_log_input_field_default_field_instances() {
t('Application method'); t('Application method');
t('Areas'); t('Areas');
t('Assets'); t('Assets');
t('Assigned to');
t('Date purchased'); t('Date purchased');
t('Describe the quantity of this input, using a value and a unit of measurement. For example, if you used 10 gallons of liquid fertilizer, enter "10" in the Value field, and "gallons" in the Units field. As you type the unit, you will have the option of selecting from units that you\'ve entered in the past.'); t('Describe the quantity of this input, using a value and a unit of measurement. For example, if you used 10 gallons of liquid fertilizer, enter "10" in the Value field, and "gallons" in the Units field. As you type the unit, you will have the option of selecting from units that you\'ve entered in the past.');
t('Files'); t('Files');
@ -697,7 +698,6 @@ function farm_log_input_field_default_field_instances() {
t('Movement'); t('Movement');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Photos'); t('Photos');
t('Purpose'); t('Purpose');
t('Quantity'); t('Quantity');

7
modules/farm/farm_log/farm_log_input/farm_log_input.views_default.inc
View File

@ -269,7 +269,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -296,7 +296,7 @@ function farm_log_input_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Assets (field_farm_asset) */ /* Contextual filter: Log: Assets (field_farm_asset) */
$handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id';
$handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset';
@ -341,7 +341,7 @@ function farm_log_input_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -463,6 +463,7 @@ function farm_log_input_views_default_views() {
t('Areas'), t('Areas'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Inputs to %1'), t('Inputs to %1'),
t('Inputs to %2'), t('Inputs to %2'),

4
modules/farm/farm_log/farm_log_movement/farm_log_movement.views_default.inc
View File

@ -608,7 +608,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -780,7 +780,7 @@ function farm_log_movement_views_default_views() {
t('Movement to'), t('Movement to'),
t('Log type'), t('Log type'),
t('Categories'), t('Categories'),
t('Owner'), t('Assigned to'),
t('All'), t('All'),
t('%1\'s movements'), t('%1\'s movements'),
t('Area'), t('Area'),

4
modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
View File

@ -282,7 +282,7 @@ function farm_log_observation_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -400,6 +400,7 @@ function farm_log_observation_field_default_field_instances() {
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Areas'); t('Areas');
t('Assets'); t('Assets');
t('Assigned to');
t('Files'); t('Files');
t('Geometry'); t('Geometry');
t('Log category'); t('Log category');
@ -407,7 +408,6 @@ function farm_log_observation_field_default_field_instances() {
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Optionally, use this quantity field to record an observed quantity.'); t('Optionally, use this quantity field to record an observed quantity.');
t('Owner');
t('Photos'); t('Photos');
t('Quantity'); t('Quantity');
t('This field is optional. It allows you to store geospatial data along with this observation.'); t('This field is optional. It allows you to store geospatial data along with this observation.');

7
modules/farm/farm_log/farm_log_observation/farm_log_observation.views_default.inc
View File

@ -286,7 +286,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -313,7 +313,7 @@ function farm_log_observation_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Assets (field_farm_asset) */ /* Contextual filter: Log: Assets (field_farm_asset) */
$handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['id'] = 'field_farm_asset_target_id';
$handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['table'] = 'field_data_field_farm_asset';
@ -358,7 +358,7 @@ function farm_log_observation_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -480,6 +480,7 @@ function farm_log_observation_views_default_views() {
t('Units'), t('Units'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Observations of %1'), t('Observations of %1'),
t('Observations in %2'), t('Observations in %2'),

4
modules/farm/farm_log/farm_log_sale/farm_log_sale.features.field_instance.inc
View File

@ -256,7 +256,7 @@ function farm_log_sale_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -458,6 +458,7 @@ function farm_log_sale_field_default_field_instances() {
// Translatables // Translatables
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Assets'); t('Assets');
t('Assigned to');
t('Customer'); t('Customer');
t('Files'); t('Files');
t('If this sale has a lot number associated with it, enter it here.'); t('If this sale has a lot number associated with it, enter it here.');
@ -465,7 +466,6 @@ function farm_log_sale_field_default_field_instances() {
t('Log category'); t('Log category');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Photos'); t('Photos');
t('Quantity'); t('Quantity');
t('Sale lot number'); t('Sale lot number');

4
modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc
View File

@ -321,7 +321,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -479,7 +479,7 @@ function farm_log_sale_views_default_views() {
t('Total price'), t('Total price'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Owner'), t('Assigned to'),
t('All'), t('All'),
t('%1\'s sales'), t('%1\'s sales'),
t('Start date'), t('Start date'),

4
modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc
View File

@ -180,7 +180,7 @@ function farm_soil_test_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -360,13 +360,13 @@ function farm_soil_test_field_default_field_instances() {
// Translatables // Translatables
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Areas'); t('Areas');
t('Assigned to');
t('Files'); t('Files');
t('Laboratory'); t('Laboratory');
t('List the names of soils that are included in this sample. For soil maps and soil names, visit http://websoilsurvey.nrcs.usda.gov/app'); t('List the names of soils that are included in this sample. For soil maps and soil names, visit http://websoilsurvey.nrcs.usda.gov/app');
t('Log category'); t('Log category');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Photos'); t('Photos');
t('Sample Points'); t('Sample Points');
t('Soil Names'); t('Soil Names');

7
modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc
View File

@ -229,7 +229,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -257,7 +257,7 @@ function farm_soil_test_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Areas (field_farm_area) */ /* Contextual filter: Log: Areas (field_farm_area) */
$handler->display->display_options['arguments']['field_farm_area_tid']['id'] = 'field_farm_area_tid'; $handler->display->display_options['arguments']['field_farm_area_tid']['id'] = 'field_farm_area_tid';
$handler->display->display_options['arguments']['field_farm_area_tid']['table'] = 'field_data_field_farm_area'; $handler->display->display_options['arguments']['field_farm_area_tid']['table'] = 'field_data_field_farm_area';
@ -301,7 +301,7 @@ function farm_soil_test_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -420,6 +420,7 @@ function farm_soil_test_views_default_views() {
t('Areas'), t('Areas'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Soil tests in %1'), t('Soil tests in %1'),
t('Start date'), t('Start date'),

4
modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc
View File

@ -178,7 +178,7 @@ function farm_water_test_field_default_field_instances() {
), ),
'entity_type' => 'log', 'entity_type' => 'log',
'field_name' => 'field_farm_log_owner', 'field_name' => 'field_farm_log_owner',
'label' => 'Owner', 'label' => 'Assigned to',
'required' => 0, 'required' => 0,
'settings' => array( 'settings' => array(
'user_register_form' => FALSE, 'user_register_form' => FALSE,
@ -329,12 +329,12 @@ function farm_water_test_field_default_field_instances() {
// Translatables // Translatables
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Areas'); t('Areas');
t('Assigned to');
t('Files'); t('Files');
t('Laboratory'); t('Laboratory');
t('Log category'); t('Log category');
t('Notes'); t('Notes');
t('Optionally assign this task to one or more people.'); t('Optionally assign this task to one or more people.');
t('Owner');
t('Photos'); t('Photos');
t('Sample points'); t('Sample points');
t('Use the map to pinpoint the location(s) from which this sample is taken.'); t('Use the map to pinpoint the location(s) from which this sample is taken.');

7
modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc
View File

@ -228,7 +228,7 @@ 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']['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']['type'] = 'taxonomy_term_reference_plain';
$handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
/* Field: Log: Owner */ /* Field: Log: Assigned to */
$handler->display->display_options['fields']['field_farm_log_owner']['id'] = 'field_farm_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']['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']['field'] = 'field_farm_log_owner';
@ -256,7 +256,7 @@ function farm_water_test_views_default_views() {
$handler->display->display_options['sorts']['name']['field'] = 'name'; $handler->display->display_options['sorts']['name']['field'] = 'name';
$handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id'; $handler->display->display_options['sorts']['name']['relationship'] = 'field_farm_log_owner_target_id';
$handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['exposed'] = TRUE;
$handler->display->display_options['sorts']['name']['expose']['label'] = 'Owner'; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Assigned to';
/* Contextual filter: Log: Areas (field_farm_area) */ /* Contextual filter: Log: Areas (field_farm_area) */
$handler->display->display_options['arguments']['field_farm_area_tid']['id'] = 'field_farm_area_tid'; $handler->display->display_options['arguments']['field_farm_area_tid']['id'] = 'field_farm_area_tid';
$handler->display->display_options['arguments']['field_farm_area_tid']['table'] = 'field_data_field_farm_area'; $handler->display->display_options['arguments']['field_farm_area_tid']['table'] = 'field_data_field_farm_area';
@ -300,7 +300,7 @@ function farm_water_test_views_default_views() {
$handler->display->display_options['filters']['uid']['group'] = 1; $handler->display->display_options['filters']['uid']['group'] = 1;
$handler->display->display_options['filters']['uid']['exposed'] = TRUE; $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner'; $handler->display->display_options['filters']['uid']['expose']['label'] = 'Assigned to';
$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
/* Filter criterion: Log: Log category (field_farm_log_category) */ /* Filter criterion: Log: Log category (field_farm_log_category) */
@ -419,6 +419,7 @@ function farm_water_test_views_default_views() {
t('Laboratory'), t('Laboratory'),
t('Notes'), t('Notes'),
t('Categories'), t('Categories'),
t('Assigned to'),
t('All'), t('All'),
t('Water tests in %1'), t('Water tests in %1'),
t('Start date'), t('Start date'),