diff --git a/modules/farm/farm_crop/farm_crop.views_default.inc b/modules/farm/farm_crop/farm_crop.views_default.inc index 1d17c0a27..77989beff 100644 --- a/modules/farm/farm_crop/farm_crop.views_default.inc +++ b/modules/farm/farm_crop/farm_crop.views_default.inc @@ -417,6 +417,7 @@ function farm_crop_views_default_views() { $handler->display->display_options['fields']['name_1']['id'] = 'name_1'; $handler->display->display_options['fields']['name_1']['table'] = 'log'; $handler->display->display_options['fields']['name_1']['field'] = 'name'; + $handler->display->display_options['fields']['name_1']['label'] = 'Log name'; $handler->display->display_options['fields']['name_1']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name_1']['alter']['path'] = 'log/[id]'; /* Field: Log: Assets */ @@ -487,6 +488,12 @@ function farm_crop_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -517,6 +524,17 @@ function farm_crop_views_default_views() { 'farm_seeding' => 'farm_seeding', ); $handler->display->display_options['filters']['type']['group'] = 1; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ $handler->display->display_options['filters']['uid']['id'] = 'uid'; $handler->display->display_options['filters']['uid']['table'] = 'users'; @@ -643,7 +661,7 @@ function farm_crop_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Assets'), t('Quantity'), t('Units'), @@ -888,6 +906,7 @@ function farm_crop_views_default_views() { $handler->display->display_options['fields']['name_1']['id'] = 'name_1'; $handler->display->display_options['fields']['name_1']['table'] = 'log'; $handler->display->display_options['fields']['name_1']['field'] = 'name'; + $handler->display->display_options['fields']['name_1']['label'] = 'Log name'; $handler->display->display_options['fields']['name_1']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name_1']['alter']['path'] = 'log/[id]'; /* Field: Log: Assets */ @@ -958,6 +977,12 @@ function farm_crop_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -988,6 +1013,17 @@ function farm_crop_views_default_views() { 'farm_transplanting' => 'farm_transplanting', ); $handler->display->display_options['filters']['type']['group'] = 1; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ $handler->display->display_options['filters']['uid']['id'] = 'uid'; $handler->display->display_options['filters']['uid']['table'] = 'users'; @@ -1114,7 +1150,7 @@ function farm_crop_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Assets'), t('Quantity'), t('Units'), diff --git a/modules/farm/farm_equipment/farm_equipment.views_default.inc b/modules/farm/farm_equipment/farm_equipment.views_default.inc index bbd9b16f2..4af0daea3 100644 --- a/modules/farm/farm_equipment/farm_equipment.views_default.inc +++ b/modules/farm/farm_equipment/farm_equipment.views_default.inc @@ -574,6 +574,7 @@ function farm_equipment_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Assets */ @@ -620,6 +621,12 @@ function farm_equipment_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -647,6 +654,17 @@ function farm_equipment_views_default_views() { 'farm_maintenance' => 'farm_maintenance', ); $handler->display->display_options['filters']['type']['group'] = 1; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ $handler->display->display_options['filters']['uid']['id'] = 'uid'; $handler->display->display_options['filters']['uid']['table'] = 'users'; @@ -771,7 +789,7 @@ function farm_equipment_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Assets'), t('Notes'), t('Categories'), diff --git a/modules/farm/farm_group/farm_group.views_default.inc b/modules/farm/farm_group/farm_group.views_default.inc index 47a6d4dc2..0c1ba51f3 100644 --- a/modules/farm/farm_group/farm_group.views_default.inc +++ b/modules/farm/farm_group/farm_group.views_default.inc @@ -417,7 +417,7 @@ function farm_group_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; - $handler->display->display_options['fields']['name']['label'] = 'Log'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Log type */ @@ -452,6 +452,18 @@ function farm_group_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name']['id'] = 'name'; + $handler->display->display_options['sorts']['name']['table'] = 'log'; + $handler->display->display_options['sorts']['name']['field'] = 'name'; + $handler->display->display_options['sorts']['name']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name']['expose']['label'] = 'Log name'; + /* Sort criterion: Log: Log type */ + $handler->display->display_options['sorts']['type']['id'] = 'type'; + $handler->display->display_options['sorts']['type']['table'] = 'log'; + $handler->display->display_options['sorts']['type']['field'] = 'type'; + $handler->display->display_options['sorts']['type']['exposed'] = TRUE; + $handler->display->display_options['sorts']['type']['expose']['label'] = 'Log type'; /* 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']['table'] = 'field_data_field_farm_asset'; @@ -464,6 +476,17 @@ function farm_group_views_default_views() { $handler->display->display_options['arguments']['field_farm_asset_target_id']['summary_options']['items_per_page'] = '25'; $handler->display->display_options['arguments']['field_farm_asset_target_id']['specify_validation'] = TRUE; $handler->display->display_options['arguments']['field_farm_asset_target_id']['validate']['type'] = 'farm_asset'; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: Log: Log type */ $handler->display->display_options['filters']['type']['id'] = 'type'; $handler->display->display_options['filters']['type']['table'] = 'log'; @@ -588,6 +611,7 @@ function farm_group_views_default_views() { t('Date'), t('Assets'), t('Group membership'), + t('Log name'), t('Log type'), t('Categories'), t('Assigned to'), diff --git a/modules/farm/farm_inventory/farm_inventory.views_default.inc b/modules/farm/farm_inventory/farm_inventory.views_default.inc index a17068cb7..48c04ba73 100644 --- a/modules/farm/farm_inventory/farm_inventory.views_default.inc +++ b/modules/farm/farm_inventory/farm_inventory.views_default.inc @@ -430,7 +430,7 @@ function farm_inventory_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; - $handler->display->display_options['fields']['name']['label'] = 'Log'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Field collection item: Asset */ @@ -486,6 +486,18 @@ function farm_inventory_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name']['id'] = 'name'; + $handler->display->display_options['sorts']['name']['table'] = 'log'; + $handler->display->display_options['sorts']['name']['field'] = 'name'; + $handler->display->display_options['sorts']['name']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name']['expose']['label'] = 'Log name'; + /* Sort criterion: Log: Log type */ + $handler->display->display_options['sorts']['type']['id'] = 'type'; + $handler->display->display_options['sorts']['type']['table'] = 'log'; + $handler->display->display_options['sorts']['type']['field'] = 'type'; + $handler->display->display_options['sorts']['type']['exposed'] = TRUE; + $handler->display->display_options['sorts']['type']['expose']['label'] = 'Log type'; /* Contextual filter: Field collection item: Asset (field_farm_inventory_asset) */ $handler->display->display_options['arguments']['field_farm_inventory_asset_target_id']['id'] = 'field_farm_inventory_asset_target_id'; $handler->display->display_options['arguments']['field_farm_inventory_asset_target_id']['table'] = 'field_data_field_farm_inventory_asset'; @@ -499,6 +511,17 @@ function farm_inventory_views_default_views() { $handler->display->display_options['arguments']['field_farm_inventory_asset_target_id']['summary_options']['items_per_page'] = '25'; $handler->display->display_options['arguments']['field_farm_inventory_asset_target_id']['specify_validation'] = TRUE; $handler->display->display_options['arguments']['field_farm_inventory_asset_target_id']['validate']['type'] = 'farm_asset'; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: Log: Log type */ $handler->display->display_options['filters']['type']['id'] = 'type'; $handler->display->display_options['filters']['type']['table'] = 'log'; @@ -621,6 +644,7 @@ function farm_inventory_views_default_views() { t('Log ID'), t('.'), t('Date'), + t('Log name'), t('Asset'), t('Adjustment value'), t('Log type'), diff --git a/modules/farm/farm_livestock/farm_livestock.views_default.inc b/modules/farm/farm_livestock/farm_livestock.views_default.inc index d4944dd7a..e71c716a8 100644 --- a/modules/farm/farm_livestock/farm_livestock.views_default.inc +++ b/modules/farm/farm_livestock/farm_livestock.views_default.inc @@ -873,6 +873,7 @@ function farm_livestock_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Assets */ @@ -919,6 +920,12 @@ function farm_livestock_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -946,6 +953,17 @@ function farm_livestock_views_default_views() { 'farm_medical' => 'farm_medical', ); $handler->display->display_options['filters']['type']['group'] = 1; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ $handler->display->display_options['filters']['uid']['id'] = 'uid'; $handler->display->display_options['filters']['uid']['table'] = 'users'; @@ -1070,7 +1088,7 @@ function farm_livestock_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Assets'), t('Notes'), t('Categories'), diff --git a/modules/farm/farm_log/farm_log.views_default.inc b/modules/farm/farm_log/farm_log.views_default.inc index 96f84ea5e..271977989 100644 --- a/modules/farm/farm_log/farm_log.views_default.inc +++ b/modules/farm/farm_log/farm_log.views_default.inc @@ -483,6 +483,12 @@ function farm_log_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -498,7 +504,7 @@ function farm_log_views_default_views() { $handler->display->display_options['filters']['name']['group'] = 1; $handler->display->display_options['filters']['name']['exposed'] = TRUE; $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; - $handler->display->display_options['filters']['name']['expose']['label'] = 'Search'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ @@ -1208,13 +1214,13 @@ function farm_log_views_default_views() { t('Log type'), t('Categories'), t('Assigned to'), - t('Search'), t('Start date'), t('End date'), t('Page'), t('Page: User Logs'), t('All'), t('Logs assigned to %1'), + t('Search'), t('Page: Plan'), t('Plan'), t('No tasks are currently planned.'), diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.views_default.inc b/modules/farm/farm_log/farm_log_activity/farm_log_activity.views_default.inc index 0d2379f7d..f53f1cf95 100644 --- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.views_default.inc +++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.views_default.inc @@ -212,6 +212,7 @@ function farm_log_activity_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Assets */ @@ -261,6 +262,12 @@ function farm_log_activity_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -311,7 +318,7 @@ function farm_log_activity_views_default_views() { $handler->display->display_options['filters']['name']['group'] = 1; $handler->display->display_options['filters']['name']['exposed'] = TRUE; $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; - $handler->display->display_options['filters']['name']['expose']['label'] = 'Search'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ @@ -438,7 +445,7 @@ function farm_log_activity_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Assets'), t('Areas'), t('Notes'), @@ -447,7 +454,6 @@ function farm_log_activity_views_default_views() { t('All'), t('Activities of %1'), t('Activities in %2'), - t('Search'), t('Start date'), t('End date'), t('Page'), diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc index 42a6190af..630b60ea3 100644 --- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc +++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc @@ -241,6 +241,7 @@ function farm_log_harvest_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Field collection item: Value */ @@ -314,6 +315,12 @@ function farm_log_harvest_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -341,6 +348,17 @@ function farm_log_harvest_views_default_views() { 'farm_harvest' => 'farm_harvest', ); $handler->display->display_options['filters']['type']['group'] = 1; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: Log: Sale lot number (field_farm_lot_number) */ $handler->display->display_options['filters']['field_farm_lot_number_value']['id'] = 'field_farm_lot_number_value'; $handler->display->display_options['filters']['field_farm_lot_number_value']['table'] = 'field_data_field_farm_lot_number'; @@ -476,7 +494,7 @@ function farm_log_harvest_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Quantity'), t('Units'), t('Assets'), diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.views_default.inc b/modules/farm/farm_log/farm_log_input/farm_log_input.views_default.inc index ee14b1387..9d18fdb71 100644 --- a/modules/farm/farm_log/farm_log_input/farm_log_input.views_default.inc +++ b/modules/farm/farm_log/farm_log_input/farm_log_input.views_default.inc @@ -233,6 +233,7 @@ function farm_log_input_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Field collection item: Value */ @@ -301,6 +302,12 @@ function farm_log_input_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -343,6 +350,17 @@ function farm_log_input_views_default_views() { 'farm_input' => 'farm_input', ); $handler->display->display_options['filters']['type']['group'] = 1; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ $handler->display->display_options['filters']['uid']['id'] = 'uid'; $handler->display->display_options['filters']['uid']['table'] = 'users'; @@ -468,7 +486,7 @@ function farm_log_input_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Quantity'), t('Units'), t('Assets'), diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.views_default.inc b/modules/farm/farm_log/farm_log_observation/farm_log_observation.views_default.inc index acfc45a77..9a4e67952 100644 --- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.views_default.inc +++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.views_default.inc @@ -252,6 +252,7 @@ function farm_log_observation_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Assets */ @@ -318,6 +319,12 @@ function farm_log_observation_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -360,6 +367,17 @@ function farm_log_observation_views_default_views() { 'farm_observation' => 'farm_observation', ); $handler->display->display_options['filters']['type']['group'] = 1; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ $handler->display->display_options['filters']['uid']['id'] = 'uid'; $handler->display->display_options['filters']['uid']['table'] = 'users'; @@ -485,7 +503,7 @@ function farm_log_observation_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Assets'), t('Areas'), t('Quantity'), diff --git a/modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc b/modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc index f0f1735ff..a04d6e7a2 100644 --- a/modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc +++ b/modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc @@ -256,6 +256,7 @@ function farm_log_sale_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Assets */ @@ -347,6 +348,12 @@ function farm_log_sale_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name']['id'] = 'name'; + $handler->display->display_options['sorts']['name']['table'] = 'log'; + $handler->display->display_options['sorts']['name']['field'] = 'name'; + $handler->display->display_options['sorts']['name']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name']['expose']['label'] = 'Log name'; /* 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']['table'] = 'field_data_field_farm_asset'; @@ -366,6 +373,18 @@ function farm_log_sale_views_default_views() { $handler->display->display_options['filters']['type']['value'] = array( 'farm_sale' => 'farm_sale', ); + $handler->display->display_options['filters']['type']['group'] = 1; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: Log: Log category (field_farm_log_category) */ $handler->display->display_options['filters']['field_farm_log_category_tid']['id'] = 'field_farm_log_category_tid'; $handler->display->display_options['filters']['field_farm_log_category_tid']['table'] = 'field_data_field_farm_log_category'; @@ -472,7 +491,7 @@ function farm_log_sale_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Assets'), t('Customer'), t('Invoice number'), diff --git a/modules/farm/farm_movement/farm_movement.views_default.inc b/modules/farm/farm_movement/farm_movement.views_default.inc index 0be707d67..96b32c477 100644 --- a/modules/farm/farm_movement/farm_movement.views_default.inc +++ b/modules/farm/farm_movement/farm_movement.views_default.inc @@ -605,7 +605,7 @@ function farm_movement_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; - $handler->display->display_options['fields']['name']['label'] = 'Log'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Log type */ @@ -640,6 +640,18 @@ function farm_movement_views_default_views() { $handler->display->display_options['sorts']['id']['table'] = 'log'; $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name']['id'] = 'name'; + $handler->display->display_options['sorts']['name']['table'] = 'log'; + $handler->display->display_options['sorts']['name']['field'] = 'name'; + $handler->display->display_options['sorts']['name']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name']['expose']['label'] = 'Log name'; + /* Sort criterion: Log: Log type */ + $handler->display->display_options['sorts']['type']['id'] = 'type'; + $handler->display->display_options['sorts']['type']['table'] = 'log'; + $handler->display->display_options['sorts']['type']['field'] = 'type'; + $handler->display->display_options['sorts']['type']['exposed'] = TRUE; + $handler->display->display_options['sorts']['type']['expose']['label'] = 'Log type'; /* 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']['table'] = 'field_data_field_farm_asset'; @@ -665,6 +677,17 @@ function farm_movement_views_default_views() { $handler->display->display_options['filters']['field_farm_move_to_tid']['expose']['operator'] = 'field_farm_move_to_tid_op'; $handler->display->display_options['filters']['field_farm_move_to_tid']['expose']['identifier'] = 'field_farm_move_to_tid'; $handler->display->display_options['filters']['field_farm_move_to_tid']['vocabulary'] = 'farm_areas'; + /* Filter criterion: Log: Name */ + $handler->display->display_options['filters']['name']['id'] = 'name'; + $handler->display->display_options['filters']['name']['table'] = 'log'; + $handler->display->display_options['filters']['name']['field'] = 'name'; + $handler->display->display_options['filters']['name']['operator'] = 'contains'; + $handler->display->display_options['filters']['name']['group'] = 1; + $handler->display->display_options['filters']['name']['exposed'] = TRUE; + $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; + $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; + $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: Log: Log type */ $handler->display->display_options['filters']['type']['id'] = 'type'; $handler->display->display_options['filters']['type']['table'] = 'log'; @@ -790,6 +813,7 @@ function farm_movement_views_default_views() { t('Date'), t('Assets'), t('Movement to'), + t('Log name'), t('Log type'), t('Categories'), t('Assigned to'), diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc index 398c88516..cf0849702 100644 --- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc +++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc @@ -214,6 +214,7 @@ function farm_soil_test_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Laboratory */ @@ -262,6 +263,12 @@ function farm_soil_test_views_default_views() { $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -300,7 +307,7 @@ function farm_soil_test_views_default_views() { $handler->display->display_options['filters']['name']['group'] = 1; $handler->display->display_options['filters']['name']['exposed'] = TRUE; $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; - $handler->display->display_options['filters']['name']['expose']['label'] = 'Name'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ @@ -427,7 +434,7 @@ function farm_soil_test_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Lab'), t('Areas'), t('Notes'), diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc b/modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc index 835abe6e4..622e9b9d6 100644 --- a/modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc +++ b/modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc @@ -214,6 +214,7 @@ function farm_water_test_views_default_views() { $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'log'; $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['label'] = 'Log name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Areas */ @@ -261,6 +262,12 @@ function farm_water_test_views_default_views() { $handler->display->display_options['sorts']['id']['field'] = 'id'; $handler->display->display_options['sorts']['id']['order'] = 'DESC'; $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; + /* Sort criterion: Log: Name */ + $handler->display->display_options['sorts']['name_1']['id'] = 'name_1'; + $handler->display->display_options['sorts']['name_1']['table'] = 'log'; + $handler->display->display_options['sorts']['name_1']['field'] = 'name'; + $handler->display->display_options['sorts']['name_1']['exposed'] = TRUE; + $handler->display->display_options['sorts']['name_1']['expose']['label'] = 'Log name'; /* Sort criterion: User: Name */ $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'users'; @@ -299,7 +306,7 @@ function farm_water_test_views_default_views() { $handler->display->display_options['filters']['name']['group'] = 1; $handler->display->display_options['filters']['name']['exposed'] = TRUE; $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op'; - $handler->display->display_options['filters']['name']['expose']['label'] = 'Name'; + $handler->display->display_options['filters']['name']['expose']['label'] = 'Log name'; $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op'; $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name'; /* Filter criterion: User: Name */ @@ -426,7 +433,7 @@ function farm_water_test_views_default_views() { t('Log ID'), t('.'), t('Date'), - t('Name'), + t('Log name'), t('Areas'), t('Laboratory'), t('Notes'),