diff --git a/modules/farm/farm_asset/farm_asset_children/farm_asset_children.views_default.inc b/modules/farm/farm_asset/farm_asset_children/farm_asset_children.views_default.inc index 95f3a7f1f..41fa47b45 100644 --- a/modules/farm/farm_asset/farm_asset_children/farm_asset_children.views_default.inc +++ b/modules/farm/farm_asset/farm_asset_children/farm_asset_children.views_default.inc @@ -44,25 +44,26 @@ function farm_asset_children_views_default_views() { 'name' => 'name', 'archived' => 'archived', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'id' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'archived' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -98,19 +99,6 @@ function farm_asset_children_views_default_views() { $handler->display->display_options['fields']['archived']['date_format'] = 'custom'; $handler->display->display_options['fields']['archived']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['archived']['second_date_format'] = 'long'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Farm asset: Parent(s) (field_farm_parent) */ $handler->display->display_options['arguments']['field_farm_parent_target_id']['id'] = 'field_farm_parent_target_id'; $handler->display->display_options['arguments']['field_farm_parent_target_id']['table'] = 'field_data_field_farm_parent'; @@ -170,7 +158,6 @@ function farm_asset_children_views_default_views() { t('.'), t('Name'), t('Archived'), - t('Asset ID'), t('All'), t('Children of %1'), t('Page'), diff --git a/modules/farm/farm_asset/farm_asset_views/farm_asset_views.views_default.inc b/modules/farm/farm_asset/farm_asset_views/farm_asset_views.views_default.inc index f50693b6f..84a60d9a4 100644 --- a/modules/farm/farm_asset/farm_asset_views/farm_asset_views.views_default.inc +++ b/modules/farm/farm_asset/farm_asset_views/farm_asset_views.views_default.inc @@ -51,7 +51,8 @@ function farm_asset_views_views_default_views() { 'field_farm_move_to' => 'field_farm_move_to', 'archived' => 'archived', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -59,8 +60,8 @@ function farm_asset_views_views_default_views() { 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -71,14 +72,14 @@ function farm_asset_views_views_default_views() { 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -100,8 +101,8 @@ function farm_asset_views_views_default_views() { 'empty_column' => 0, ), 'archived' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -261,32 +262,6 @@ function farm_asset_views_views_default_views() { $handler->display->display_options['fields']['archived']['date_format'] = 'custom'; $handler->display->display_options['fields']['archived']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['archived']['second_date_format'] = 'long'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset type */ - $handler->display->display_options['sorts']['type']['id'] = 'type'; - $handler->display->display_options['sorts']['type']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['type']['field'] = 'type'; - $handler->display->display_options['sorts']['type']['exposed'] = TRUE; - $handler->display->display_options['sorts']['type']['expose']['label'] = 'Type'; - /* Sort criterion: Farm asset: Archived */ - $handler->display->display_options['sorts']['archived']['id'] = 'archived'; - $handler->display->display_options['sorts']['archived']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['archived']['field'] = 'archived'; - $handler->display->display_options['sorts']['archived']['order'] = 'DESC'; - $handler->display->display_options['sorts']['archived']['exposed'] = TRUE; - $handler->display->display_options['sorts']['archived']['expose']['label'] = 'Archived date'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Filter criterion: Farm asset: Name */ $handler->display->display_options['filters']['name']['id'] = 'name'; $handler->display->display_options['filters']['name']['table'] = 'farm_asset'; @@ -395,8 +370,6 @@ function farm_asset_views_views_default_views() { t('Group'), t('Location'), t('Archived'), - t('Type'), - t('Archived date'), t('Page'), ); $export['farm_asset'] = $view; @@ -480,9 +453,13 @@ function farm_asset_views_views_default_views() { $handler->display->display_options['fields']['entityreference_view_widget']['id'] = 'entityreference_view_widget'; $handler->display->display_options['fields']['entityreference_view_widget']['table'] = 'farm_asset'; $handler->display->display_options['fields']['entityreference_view_widget']['field'] = 'entityreference_view_widget'; - $handler->display->display_options['fields']['entityreference_view_widget']['label'] = 'Asset name'; + $handler->display->display_options['fields']['entityreference_view_widget']['label'] = ''; + $handler->display->display_options['fields']['entityreference_view_widget']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['entityreference_view_widget']['ervw']['force_single'] = 0; - $handler->display->display_options['fields']['entityreference_view_widget']['ervw']['label_display'] = 'after'; + /* Field: Farm asset: Name */ + $handler->display->display_options['fields']['name']['id'] = 'name'; + $handler->display->display_options['fields']['name']['table'] = 'farm_asset'; + $handler->display->display_options['fields']['name']['field'] = 'name'; /* Field: Farm asset: Farm asset type */ $handler->display->display_options['fields']['type']['id'] = 'type'; $handler->display->display_options['fields']['type']['table'] = 'farm_asset'; @@ -504,25 +481,6 @@ function farm_asset_views_views_default_views() { 'link' => 1, ); $handler->display->display_options['fields']['field_farm_group']['delta_offset'] = '0'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset type */ - $handler->display->display_options['sorts']['type']['id'] = 'type'; - $handler->display->display_options['sorts']['type']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['type']['field'] = 'type'; - $handler->display->display_options['sorts']['type']['exposed'] = TRUE; - $handler->display->display_options['sorts']['type']['expose']['label'] = 'Asset type'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Farm asset: Farm asset ID */ $handler->display->display_options['arguments']['id']['id'] = 'id'; $handler->display->display_options['arguments']['id']['table'] = 'farm_asset'; @@ -607,19 +565,28 @@ function farm_asset_views_views_default_views() { $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['columns'] = array( 'entityreference_view_widget' => 'entityreference_view_widget', + 'name' => 'name', 'type' => 'type', 'field_farm_move_to' => 'field_farm_move_to', 'field_farm_group' => 'field_farm_group', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'entityreference_view_widget' => array( 'align' => '', 'separator' => '', 'empty_column' => 0, ), + 'name' => array( + 'sortable' => 1, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -660,12 +627,10 @@ function farm_asset_views_views_default_views() { t('No assets found.'), t('Latest movement'), t('Group membership'), - t('Asset name'), + t('Name'), t('Asset type'), t('Location'), t('Group'), - t('Name'), - t('Asset ID'), t('All'), t('Archived'), t('Entity Reference View Widget'), diff --git a/modules/farm/farm_crop/farm_crop.views_default.inc b/modules/farm/farm_crop/farm_crop.views_default.inc index 9c2361808..6bfb83c40 100644 --- a/modules/farm/farm_crop/farm_crop.views_default.inc +++ b/modules/farm/farm_crop/farm_crop.views_default.inc @@ -98,14 +98,7 @@ function farm_crop_views_default_views() { $handler->display->display_options['sorts']['name']['id'] = 'name'; $handler->display->display_options['sorts']['name']['table'] = 'taxonomy_term_data'; $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Taxonomy term: Crop family (field_farm_crop_family) */ - $handler->display->display_options['sorts']['field_farm_crop_family_tid']['id'] = 'field_farm_crop_family_tid'; - $handler->display->display_options['sorts']['field_farm_crop_family_tid']['table'] = 'field_data_field_farm_crop_family'; - $handler->display->display_options['sorts']['field_farm_crop_family_tid']['field'] = 'field_farm_crop_family_tid'; - $handler->display->display_options['sorts']['field_farm_crop_family_tid']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_crop_family_tid']['expose']['label'] = 'Family'; /* Contextual filter: Taxonomy term: Crop family (field_farm_crop_family) */ $handler->display->display_options['arguments']['field_farm_crop_family_tid']['id'] = 'field_farm_crop_family_tid'; $handler->display->display_options['arguments']['field_farm_crop_family_tid']['table'] = 'field_data_field_farm_crop_family'; @@ -181,7 +174,6 @@ function farm_crop_views_default_views() { t('('), t(')'), t('Name'), - t('Family'), t('All'), t('Crops in %1'), t('Crop family'), @@ -233,7 +225,8 @@ function farm_crop_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -241,28 +234,28 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name_1' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -274,14 +267,14 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'field_farm_quantity_value' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_units' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -293,7 +286,7 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -507,26 +500,6 @@ function farm_crop_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; @@ -807,7 +780,8 @@ function farm_crop_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -815,28 +789,28 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name_1' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -848,14 +822,14 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'field_farm_quantity_value' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_units' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -867,7 +841,7 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -1081,26 +1055,6 @@ function farm_crop_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; @@ -1379,7 +1333,8 @@ function farm_crop_views_default_views() { 'field_farm_move_to' => 'field_farm_move_to', 'archived' => 'archived', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -1387,8 +1342,8 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -1399,7 +1354,7 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -1411,14 +1366,14 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'field_farm_season' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_description' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -1440,8 +1395,8 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'archived' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -1612,25 +1567,6 @@ function farm_crop_views_default_views() { $handler->display->display_options['fields']['archived']['date_format'] = 'custom'; $handler->display->display_options['fields']['archived']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['archived']['second_date_format'] = 'long'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Season (field_farm_season) */ - $handler->display->display_options['sorts']['field_farm_season_tid']['id'] = 'field_farm_season_tid'; - $handler->display->display_options['sorts']['field_farm_season_tid']['table'] = 'field_data_field_farm_season'; - $handler->display->display_options['sorts']['field_farm_season_tid']['field'] = 'field_farm_season_tid'; - $handler->display->display_options['sorts']['field_farm_season_tid']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_season_tid']['expose']['label'] = 'Season'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Field collection item: Movement to (field_farm_move_to) */ $handler->display->display_options['arguments']['field_farm_move_to_tid']['id'] = 'field_farm_move_to_tid'; $handler->display->display_options['arguments']['field_farm_move_to_tid']['table'] = 'field_data_field_farm_move_to'; diff --git a/modules/farm/farm_equipment/farm_equipment.views_default.inc b/modules/farm/farm_equipment/farm_equipment.views_default.inc index ffaec592d..533f0ad57 100644 --- a/modules/farm/farm_equipment/farm_equipment.views_default.inc +++ b/modules/farm/farm_equipment/farm_equipment.views_default.inc @@ -53,7 +53,8 @@ function farm_equipment_views_default_views() { 'field_farm_move_to' => 'field_farm_move_to', 'archived' => 'archived', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -61,8 +62,8 @@ function farm_equipment_views_default_views() { 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -73,35 +74,35 @@ function farm_equipment_views_default_views() { 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_manufacturer' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_model' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_serial_number' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_description' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -123,8 +124,8 @@ function farm_equipment_views_default_views() { 'empty_column' => 0, ), 'archived' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -297,19 +298,6 @@ function farm_equipment_views_default_views() { $handler->display->display_options['fields']['archived']['date_format'] = 'custom'; $handler->display->display_options['fields']['archived']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['archived']['second_date_format'] = 'long'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Field collection item: Movement to (field_farm_move_to) */ $handler->display->display_options['arguments']['field_farm_move_to_tid']['id'] = 'field_farm_move_to_tid'; $handler->display->display_options['arguments']['field_farm_move_to_tid']['table'] = 'field_data_field_farm_move_to'; @@ -546,9 +534,13 @@ function farm_equipment_views_default_views() { $handler->display->display_options['fields']['entityreference_view_widget']['id'] = 'entityreference_view_widget'; $handler->display->display_options['fields']['entityreference_view_widget']['table'] = 'farm_asset'; $handler->display->display_options['fields']['entityreference_view_widget']['field'] = 'entityreference_view_widget'; - $handler->display->display_options['fields']['entityreference_view_widget']['label'] = 'Asset name'; + $handler->display->display_options['fields']['entityreference_view_widget']['label'] = ''; + $handler->display->display_options['fields']['entityreference_view_widget']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['entityreference_view_widget']['ervw']['force_single'] = 0; - $handler->display->display_options['fields']['entityreference_view_widget']['ervw']['label_display'] = 'after'; + /* Field: Farm asset: Name */ + $handler->display->display_options['fields']['name']['id'] = 'name'; + $handler->display->display_options['fields']['name']['table'] = 'farm_asset'; + $handler->display->display_options['fields']['name']['field'] = 'name'; /* Field: Field collection item: Movement to */ $handler->display->display_options['fields']['field_farm_move_to']['id'] = 'field_farm_move_to'; $handler->display->display_options['fields']['field_farm_move_to']['table'] = 'field_data_field_farm_move_to'; @@ -565,19 +557,6 @@ function farm_equipment_views_default_views() { 'link' => 1, ); $handler->display->display_options['fields']['field_farm_group']['delta_offset'] = '0'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Farm asset: Farm asset ID */ $handler->display->display_options['arguments']['id']['id'] = 'id'; $handler->display->display_options['arguments']['id']['table'] = 'farm_asset'; @@ -664,19 +643,20 @@ function farm_equipment_views_default_views() { $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['columns'] = array( 'entityreference_view_widget' => 'entityreference_view_widget', - 'type' => 'type', + 'name' => 'name', 'field_farm_move_to' => 'field_farm_move_to', 'field_farm_group' => 'field_farm_group', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'entityreference_view_widget' => array( 'align' => '', 'separator' => '', 'empty_column' => 0, ), - 'type' => array( - 'sortable' => 0, + 'name' => array( + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -717,11 +697,9 @@ function farm_equipment_views_default_views() { t('No assets found.'), t('Latest movement'), t('Group membership'), - t('Asset name'), + t('Name'), t('Location'), t('Group'), - t('Name'), - t('Asset ID'), t('All'), t('Asset type'), t('Archived'), @@ -766,12 +744,14 @@ function farm_equipment_views_default_views() { 'timestamp' => 'timestamp', 'name' => 'name', 'field_farm_asset' => 'field_farm_asset', + 'field_farm_area' => 'field_farm_area', 'field_farm_notes' => 'field_farm_notes', 'field_farm_flags' => 'field_farm_flags', 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -779,28 +759,28 @@ function farm_equipment_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -811,8 +791,13 @@ function farm_equipment_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_area' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -994,26 +979,6 @@ function farm_equipment_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; diff --git a/modules/farm/farm_equipment/farm_equipment_field/farm_equipment_field.views_default.inc b/modules/farm/farm_equipment/farm_equipment_field/farm_equipment_field.views_default.inc index 670d52bed..bfc289c95 100644 --- a/modules/farm/farm_equipment/farm_equipment_field/farm_equipment_field.views_default.inc +++ b/modules/farm/farm_equipment/farm_equipment_field/farm_equipment_field.views_default.inc @@ -54,7 +54,8 @@ function farm_equipment_field_views_default_views() { 'type' => 'type', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -62,28 +63,28 @@ function farm_equipment_field_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -105,7 +106,7 @@ function farm_equipment_field_views_default_views() { 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -122,7 +123,7 @@ function farm_equipment_field_views_default_views() { 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -305,26 +306,6 @@ function farm_equipment_field_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* Contextual filter: Log: Equipment used (field_farm_equipment) */ $handler->display->display_options['arguments']['field_farm_equipment_target_id']['id'] = 'field_farm_equipment_target_id'; $handler->display->display_options['arguments']['field_farm_equipment_target_id']['table'] = 'field_data_field_farm_equipment'; diff --git a/modules/farm/farm_group/farm_group.views_default.inc b/modules/farm/farm_group/farm_group.views_default.inc index d2e808629..e6e42aae7 100644 --- a/modules/farm/farm_group/farm_group.views_default.inc +++ b/modules/farm/farm_group/farm_group.views_default.inc @@ -87,19 +87,16 @@ function farm_group_views_default_views() { $handler->display->display_options['fields']['entityreference_view_widget']['label'] = ''; $handler->display->display_options['fields']['entityreference_view_widget']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['entityreference_view_widget']['ervw']['force_single'] = 0; - $handler->display->display_options['fields']['entityreference_view_widget']['ervw']['label_display'] = 'after'; + /* Field: Farm asset: Name */ + $handler->display->display_options['fields']['name']['id'] = 'name'; + $handler->display->display_options['fields']['name']['table'] = 'farm_asset'; + $handler->display->display_options['fields']['name']['field'] = 'name'; /* Field: Field collection item: Movement to */ $handler->display->display_options['fields']['field_farm_move_to']['id'] = 'field_farm_move_to'; $handler->display->display_options['fields']['field_farm_move_to']['table'] = 'field_data_field_farm_move_to'; $handler->display->display_options['fields']['field_farm_move_to']['field'] = 'field_farm_move_to'; $handler->display->display_options['fields']['field_farm_move_to']['relationship'] = 'latest_movement'; $handler->display->display_options['fields']['field_farm_move_to']['label'] = 'Location'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; /* Contextual filter: Farm asset: Farm asset ID */ $handler->display->display_options['arguments']['id']['id'] = 'id'; $handler->display->display_options['arguments']['id']['table'] = 'farm_asset'; @@ -162,15 +159,24 @@ function farm_group_views_default_views() { $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['columns'] = array( 'entityreference_view_widget' => 'entityreference_view_widget', + 'name' => 'name', 'field_farm_move_to' => 'field_farm_move_to', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'entityreference_view_widget' => array( 'align' => '', 'separator' => '', 'empty_column' => 0, ), + 'name' => array( + 'sortable' => 1, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'field_farm_move_to' => array( 'align' => '', 'separator' => '', @@ -200,8 +206,8 @@ function farm_group_views_default_views() { t('Displaying @start - @end of @total'), t('No groups found.'), t('Latest movement'), - t('Location'), t('Name'), + t('Location'), t('All'), t('Archived'), t('Entity Reference View Widget'), @@ -251,7 +257,8 @@ function farm_group_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -259,22 +266,22 @@ function farm_group_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -290,14 +297,14 @@ function farm_group_views_default_views() { 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -481,32 +488,6 @@ function farm_group_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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'; - /* Sort criterion: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; @@ -716,7 +697,8 @@ function farm_group_views_default_views() { 'type' => 'type', 'archived' => 'archived', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -724,29 +706,29 @@ function farm_group_views_default_views() { 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'archived' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -866,19 +848,6 @@ function farm_group_views_default_views() { $handler->display->display_options['fields']['archived']['date_format'] = 'custom'; $handler->display->display_options['fields']['archived']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['archived']['second_date_format'] = 'long'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Field collection item: Group (field_farm_group) */ $handler->display->display_options['arguments']['field_farm_group_target_id']['id'] = 'field_farm_group_target_id'; $handler->display->display_options['arguments']['field_farm_group_target_id']['table'] = 'field_data_field_farm_group'; @@ -948,7 +917,6 @@ function farm_group_views_default_views() { t('Name'), t('Asset type'), t('Archived'), - t('Asset ID'), t('All'), t('Members of %1'), t('Page'), @@ -995,7 +963,8 @@ function farm_group_views_default_views() { 'field_farm_move_to' => 'field_farm_move_to', 'archived' => 'archived', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -1003,8 +972,8 @@ function farm_group_views_default_views() { 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -1015,14 +984,14 @@ function farm_group_views_default_views() { 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_description' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -1044,8 +1013,8 @@ function farm_group_views_default_views() { 'empty_column' => 0, ), 'archived' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -1195,19 +1164,6 @@ function farm_group_views_default_views() { $handler->display->display_options['fields']['archived']['date_format'] = 'custom'; $handler->display->display_options['fields']['archived']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['archived']['second_date_format'] = 'long'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Field collection item: Movement to (field_farm_move_to) */ $handler->display->display_options['arguments']['field_farm_move_to_tid']['id'] = 'field_farm_move_to_tid'; $handler->display->display_options['arguments']['field_farm_move_to_tid']['table'] = 'field_data_field_farm_move_to'; diff --git a/modules/farm/farm_inventory/farm_inventory.views_default.inc b/modules/farm/farm_inventory/farm_inventory.views_default.inc index 8f054483d..90fbd0421 100644 --- a/modules/farm/farm_inventory/farm_inventory.views_default.inc +++ b/modules/farm/farm_inventory/farm_inventory.views_default.inc @@ -91,7 +91,10 @@ function farm_inventory_views_default_views() { $handler->display->display_options['fields']['entityreference_view_widget']['label'] = ''; $handler->display->display_options['fields']['entityreference_view_widget']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['entityreference_view_widget']['ervw']['force_single'] = 1; - $handler->display->display_options['fields']['entityreference_view_widget']['ervw']['label_display'] = 'after'; + /* Field: Farm asset: Name */ + $handler->display->display_options['fields']['name']['id'] = 'name'; + $handler->display->display_options['fields']['name']['table'] = 'farm_asset'; + $handler->display->display_options['fields']['name']['field'] = 'name'; /* Field: Farm asset: Farm asset type */ $handler->display->display_options['fields']['type']['id'] = 'type'; $handler->display->display_options['fields']['type']['table'] = 'farm_asset'; @@ -113,25 +116,6 @@ function farm_inventory_views_default_views() { 'link' => 1, ); $handler->display->display_options['fields']['field_farm_group']['delta_offset'] = '0'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset type */ - $handler->display->display_options['sorts']['type']['id'] = 'type'; - $handler->display->display_options['sorts']['type']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['type']['field'] = 'type'; - $handler->display->display_options['sorts']['type']['exposed'] = TRUE; - $handler->display->display_options['sorts']['type']['expose']['label'] = 'Asset type'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Farm asset: Farm asset ID */ $handler->display->display_options['arguments']['id']['id'] = 'id'; $handler->display->display_options['arguments']['id']['table'] = 'farm_asset'; @@ -213,19 +197,28 @@ function farm_inventory_views_default_views() { $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['columns'] = array( 'entityreference_view_widget' => 'entityreference_view_widget', + 'name' => 'name', 'type' => 'type', 'field_farm_move_to' => 'field_farm_move_to', 'field_farm_group' => 'field_farm_group', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'entityreference_view_widget' => array( 'align' => '', 'separator' => '', 'empty_column' => 0, ), + 'name' => array( + 'sortable' => 1, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -266,11 +259,10 @@ function farm_inventory_views_default_views() { t('No assets found.'), t('Latest movement'), t('Group membership'), + t('Name'), t('Asset type'), t('Location'), t('Group'), - t('Name'), - t('Asset ID'), t('All'), t('Archived'), t('Entity Reference View Widget'), @@ -320,7 +312,8 @@ function farm_inventory_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -328,49 +321,49 @@ function farm_inventory_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_inventory_asset' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_inventory_value' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -558,32 +551,6 @@ function farm_inventory_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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'; - /* Sort criterion: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; diff --git a/modules/farm/farm_ledger/farm_ledger.views_default.inc b/modules/farm/farm_ledger/farm_ledger.views_default.inc index a09758e9d..d7638bc7d 100644 --- a/modules/farm/farm_ledger/farm_ledger.views_default.inc +++ b/modules/farm/farm_ledger/farm_ledger.views_default.inc @@ -59,7 +59,8 @@ function farm_ledger_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -67,28 +68,28 @@ function farm_ledger_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -105,56 +106,56 @@ function farm_ledger_views_default_views() { 'empty_column' => 0, ), 'field_farm_seller' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_invoice_number' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_lot_number' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_value' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_units' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_unit_price' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_total_price' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -373,26 +374,6 @@ function farm_ledger_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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 ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; @@ -634,7 +615,8 @@ function farm_ledger_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -642,28 +624,28 @@ function farm_ledger_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -680,56 +662,56 @@ function farm_ledger_views_default_views() { 'empty_column' => 0, ), 'field_farm_customer' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_invoice_number' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_lot_number' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_value' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_units' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_unit_price' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_total_price' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -948,26 +930,6 @@ function farm_ledger_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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 ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; diff --git a/modules/farm/farm_livestock/farm_livestock.views_default.inc b/modules/farm/farm_livestock/farm_livestock.views_default.inc index 2d9e45426..b49cf1d55 100644 --- a/modules/farm/farm_livestock/farm_livestock.views_default.inc +++ b/modules/farm/farm_livestock/farm_livestock.views_default.inc @@ -183,7 +183,8 @@ function farm_livestock_views_default_views() { 'field_farm_move_to' => 'field_farm_move_to', 'archived' => 'archived', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -191,7 +192,7 @@ function farm_livestock_views_default_views() { 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -203,70 +204,70 @@ function farm_livestock_views_default_views() { 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_animal_type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'inventory' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_date' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_animal_sex' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_animal_castrated' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_animal_tag_id' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_animal_tag_type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_animal_tag_location' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_description' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -288,8 +289,8 @@ function farm_livestock_views_default_views() { 'empty_column' => 0, ), 'archived' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -510,43 +511,6 @@ function farm_livestock_views_default_views() { $handler->display->display_options['fields']['archived']['date_format'] = 'custom'; $handler->display->display_options['fields']['archived']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['archived']['second_date_format'] = 'long'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Date of birth (field_farm_date) */ - $handler->display->display_options['sorts']['field_farm_date_value']['id'] = 'field_farm_date_value'; - $handler->display->display_options['sorts']['field_farm_date_value']['table'] = 'field_data_field_farm_date'; - $handler->display->display_options['sorts']['field_farm_date_value']['field'] = 'field_farm_date_value'; - $handler->display->display_options['sorts']['field_farm_date_value']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_date_value']['expose']['label'] = 'Date of birth'; - /* Sort criterion: Farm asset: Species/breed (field_farm_animal_type) */ - $handler->display->display_options['sorts']['field_farm_animal_type_tid']['id'] = 'field_farm_animal_type_tid'; - $handler->display->display_options['sorts']['field_farm_animal_type_tid']['table'] = 'field_data_field_farm_animal_type'; - $handler->display->display_options['sorts']['field_farm_animal_type_tid']['field'] = 'field_farm_animal_type_tid'; - $handler->display->display_options['sorts']['field_farm_animal_type_tid']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_animal_type_tid']['expose']['label'] = 'Species/Breed'; - /* Sort criterion: Farm asset: Sex (field_farm_animal_sex) */ - $handler->display->display_options['sorts']['field_farm_animal_sex_value']['id'] = 'field_farm_animal_sex_value'; - $handler->display->display_options['sorts']['field_farm_animal_sex_value']['table'] = 'field_data_field_farm_animal_sex'; - $handler->display->display_options['sorts']['field_farm_animal_sex_value']['field'] = 'field_farm_animal_sex_value'; - $handler->display->display_options['sorts']['field_farm_animal_sex_value']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_animal_sex_value']['expose']['label'] = 'Sex'; - /* Sort criterion: Field collection item: ID (field_farm_animal_tag_id) */ - $handler->display->display_options['sorts']['field_farm_animal_tag_id_value']['id'] = 'field_farm_animal_tag_id_value'; - $handler->display->display_options['sorts']['field_farm_animal_tag_id_value']['table'] = 'field_data_field_farm_animal_tag_id'; - $handler->display->display_options['sorts']['field_farm_animal_tag_id_value']['field'] = 'field_farm_animal_tag_id_value'; - $handler->display->display_options['sorts']['field_farm_animal_tag_id_value']['relationship'] = 'field_farm_animal_tag_value'; - $handler->display->display_options['sorts']['field_farm_animal_tag_id_value']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_animal_tag_id_value']['expose']['label'] = 'ID Tag'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Field collection item: Movement to (field_farm_move_to) */ $handler->display->display_options['arguments']['field_farm_move_to_tid']['id'] = 'field_farm_move_to_tid'; $handler->display->display_options['arguments']['field_farm_move_to_tid']['table'] = 'field_data_field_farm_move_to'; @@ -777,11 +741,10 @@ function farm_livestock_views_default_views() { t('Group'), t('Location'), t('Archived'), - t('Species/Breed'), - t('ID Tag'), t('All'), t('Animals in %1'), t('Animals of type %2'), + t('ID Tag'), t('If there are multiple ID tags on an animal, this filter will only look at the first one.'), t('Type'), t('Date of birth (range)'), @@ -833,7 +796,8 @@ function farm_livestock_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -841,35 +805,35 @@ function farm_livestock_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_mother' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -886,7 +850,7 @@ function farm_livestock_views_default_views() { 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -1081,26 +1045,6 @@ function farm_livestock_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; @@ -1383,7 +1327,8 @@ function farm_livestock_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -1391,28 +1336,28 @@ function farm_livestock_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -1424,7 +1369,7 @@ function farm_livestock_views_default_views() { 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -1601,26 +1546,6 @@ function farm_livestock_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; diff --git a/modules/farm/farm_log/farm_log.views_default.inc b/modules/farm/farm_log/farm_log.views_default.inc index bc2c33432..a08719e08 100644 --- a/modules/farm/farm_log/farm_log.views_default.inc +++ b/modules/farm/farm_log/farm_log.views_default.inc @@ -53,7 +53,8 @@ function farm_log_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -61,28 +62,28 @@ function farm_log_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -99,7 +100,7 @@ function farm_log_views_default_views() { 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -275,26 +276,6 @@ function farm_log_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* Filter criterion: Log: Name */ $handler->display->display_options['filters']['name']['id'] = 'name'; $handler->display->display_options['filters']['name']['table'] = 'log'; @@ -425,21 +406,6 @@ function farm_log_views_default_views() { /* Display: Page: User Logs */ $handler = $view->new_display('page', 'Page: User Logs', 'page_user'); - $handler->display->display_options['defaults']['sorts'] = FALSE; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* Sort criterion: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; $handler->display->display_options['defaults']['arguments'] = FALSE; /* Contextual filter: Log: Assigned to (field_farm_log_owner) */ $handler->display->display_options['arguments']['field_farm_log_owner_target_id']['id'] = 'field_farm_log_owner_target_id'; @@ -577,20 +543,6 @@ function farm_log_views_default_views() { $handler->display->display_options['empty']['area_text_custom']['field'] = 'area_text_custom'; $handler->display->display_options['empty']['area_text_custom']['empty'] = TRUE; $handler->display->display_options['empty']['area_text_custom']['content'] = 'No tasks are currently planned.'; - $handler->display->display_options['defaults']['sorts'] = FALSE; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* Sort criterion: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; $handler->display->display_options['defaults']['filter_groups'] = FALSE; $handler->display->display_options['defaults']['filters'] = FALSE; /* Filter criterion: Date: Date (log) */ @@ -776,13 +728,6 @@ function farm_log_views_default_views() { $handler->display->display_options['fields']['type']['id'] = 'type'; $handler->display->display_options['fields']['type']['table'] = 'log'; $handler->display->display_options['fields']['type']['field'] = 'type'; - $handler->display->display_options['defaults']['sorts'] = FALSE; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; $handler->display->display_options['defaults']['filter_groups'] = FALSE; $handler->display->display_options['defaults']['filters'] = FALSE; /* Filter criterion: Date: Date (log) */ @@ -815,20 +760,6 @@ function farm_log_views_default_views() { $handler = $view->new_display('page', 'Page: Late', 'page_late'); $handler->display->display_options['defaults']['title'] = FALSE; $handler->display->display_options['title'] = 'Late tasks'; - $handler->display->display_options['defaults']['sorts'] = FALSE; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* Sort criterion: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; $handler->display->display_options['defaults']['filter_groups'] = FALSE; $handler->display->display_options['defaults']['filters'] = FALSE; /* Filter criterion: Date: Date (log) */ @@ -1017,13 +948,6 @@ function farm_log_views_default_views() { $handler->display->display_options['fields']['type']['id'] = 'type'; $handler->display->display_options['fields']['type']['table'] = 'log'; $handler->display->display_options['fields']['type']['field'] = 'type'; - $handler->display->display_options['defaults']['sorts'] = FALSE; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; $handler->display->display_options['defaults']['filter_groups'] = FALSE; $handler->display->display_options['defaults']['filters'] = FALSE; /* Filter criterion: Date: Date (log) */ 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 9b97aaa9a..834f92340 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 @@ -52,7 +52,8 @@ function farm_log_activity_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -60,28 +61,28 @@ function farm_log_activity_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -98,7 +99,7 @@ function farm_log_activity_views_default_views() { 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -278,26 +279,6 @@ function farm_log_activity_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; 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 f69ea18b4..43c20979c 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 @@ -55,7 +55,8 @@ function farm_log_harvest_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -63,42 +64,42 @@ function farm_log_harvest_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_value' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_units' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -115,14 +116,14 @@ function farm_log_harvest_views_default_views() { 'empty_column' => 0, ), 'field_farm_lot_number' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -329,26 +330,6 @@ function farm_log_harvest_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; @@ -566,6 +547,7 @@ function farm_log_harvest_views_default_views() { t('Assigned to'), t('All'), t('Harvests of %1'), + t('Harvests in %2'), t('Lot number'), t('Start date'), t('End date'), 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 f59533d36..ad0522d3e 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 @@ -54,7 +54,8 @@ function farm_log_input_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -62,42 +63,42 @@ function farm_log_input_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_value' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_units' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -114,7 +115,7 @@ function farm_log_input_views_default_views() { 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -317,26 +318,6 @@ function farm_log_input_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; 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 3cef98009..47d195ed9 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 @@ -55,7 +55,8 @@ function farm_log_observation_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -63,15 +64,15 @@ function farm_log_observation_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -82,14 +83,14 @@ function farm_log_observation_views_default_views() { 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -106,21 +107,21 @@ function farm_log_observation_views_default_views() { 'empty_column' => 0, ), 'field_farm_quantity_value' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_units' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -334,26 +335,6 @@ function farm_log_observation_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; diff --git a/modules/farm/farm_movement/farm_movement.views_default.inc b/modules/farm/farm_movement/farm_movement.views_default.inc index 53a7a273a..91240cce7 100644 --- a/modules/farm/farm_movement/farm_movement.views_default.inc +++ b/modules/farm/farm_movement/farm_movement.views_default.inc @@ -43,42 +43,43 @@ function farm_movement_views_default_views() { 'id' => 'id', 'name' => 'name', 'type' => 'type', - 'active' => 'active', + 'archived' => 'archived', 'timestamp' => 'timestamp', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), - 'active' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'archived' => array( + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -142,11 +143,6 @@ function farm_movement_views_default_views() { $handler->display->display_options['fields']['timestamp']['date_format'] = 'custom'; $handler->display->display_options['fields']['timestamp']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['timestamp']['second_date_format'] = 'long'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; /* Contextual filter: Field collection item: Movement to (field_farm_move_to) */ $handler->display->display_options['arguments']['field_farm_move_to_tid']['id'] = 'field_farm_move_to_tid'; $handler->display->display_options['arguments']['field_farm_move_to_tid']['table'] = 'field_data_field_farm_move_to'; @@ -426,7 +422,8 @@ function farm_movement_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -434,22 +431,22 @@ function farm_movement_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -465,14 +462,14 @@ function farm_movement_views_default_views() { 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -662,32 +659,6 @@ function farm_movement_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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'; - /* Sort criterion: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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'; diff --git a/modules/farm/farm_people/farm_people.views_default.inc b/modules/farm/farm_people/farm_people.views_default.inc index 1ce927978..1c40c00a5 100644 --- a/modules/farm/farm_people/farm_people.views_default.inc +++ b/modules/farm/farm_people/farm_people.views_default.inc @@ -47,17 +47,18 @@ function farm_people_views_default_views() { 'status' => 'status', 'nothing' => 'nothing', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'uid' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -69,21 +70,21 @@ function farm_people_views_default_views() { 'empty_column' => 0, ), 'created' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'access' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'status' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -145,25 +146,6 @@ function farm_people_views_default_views() { $handler->display->display_options['fields']['nothing']['alter']['text'] = 'Assigned logs'; $handler->display->display_options['fields']['nothing']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['nothing']['alter']['path'] = 'user/[uid]/logs'; - /* Sort criterion: User: Created date */ - $handler->display->display_options['sorts']['created']['id'] = 'created'; - $handler->display->display_options['sorts']['created']['table'] = 'users'; - $handler->display->display_options['sorts']['created']['field'] = 'created'; - $handler->display->display_options['sorts']['created']['exposed'] = TRUE; - $handler->display->display_options['sorts']['created']['expose']['label'] = 'Created date'; - /* Sort criterion: User: Last access */ - $handler->display->display_options['sorts']['access']['id'] = 'access'; - $handler->display->display_options['sorts']['access']['table'] = 'users'; - $handler->display->display_options['sorts']['access']['field'] = 'access'; - $handler->display->display_options['sorts']['access']['order'] = 'DESC'; - $handler->display->display_options['sorts']['access']['exposed'] = TRUE; - $handler->display->display_options['sorts']['access']['expose']['label'] = 'Last access'; - /* Sort criterion: User: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'users'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; /* Filter criterion: User: The user ID */ $handler->display->display_options['filters']['uid_raw']['id'] = 'uid_raw'; $handler->display->display_options['filters']['uid_raw']['table'] = 'users'; diff --git a/modules/farm/farm_plan/farm_plan.views_default.inc b/modules/farm/farm_plan/farm_plan.views_default.inc index 081de90fe..5d62cb952 100644 --- a/modules/farm/farm_plan/farm_plan.views_default.inc +++ b/modules/farm/farm_plan/farm_plan.views_default.inc @@ -47,32 +47,33 @@ function farm_plan_views_default_views() { 'type' => 'type', 'active' => 'active', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'active' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -106,24 +107,6 @@ function farm_plan_views_default_views() { $handler->display->display_options['fields']['active']['table'] = 'farm_plan'; $handler->display->display_options['fields']['active']['field'] = 'active'; $handler->display->display_options['fields']['active']['not'] = 0; - /* Sort criterion: Farm plan: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_plan'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm plan: Farm plan type */ - $handler->display->display_options['sorts']['type']['id'] = 'type'; - $handler->display->display_options['sorts']['type']['table'] = 'farm_plan'; - $handler->display->display_options['sorts']['type']['field'] = 'type'; - $handler->display->display_options['sorts']['type']['exposed'] = TRUE; - $handler->display->display_options['sorts']['type']['expose']['label'] = 'Type'; - /* Sort criterion: Farm plan: Active */ - $handler->display->display_options['sorts']['active']['id'] = 'active'; - $handler->display->display_options['sorts']['active']['table'] = 'farm_plan'; - $handler->display->display_options['sorts']['active']['field'] = 'active'; - $handler->display->display_options['sorts']['active']['exposed'] = TRUE; - $handler->display->display_options['sorts']['active']['expose']['label'] = 'Active'; /* Filter criterion: Farm plan: Name */ $handler->display->display_options['filters']['name']['id'] = 'name'; $handler->display->display_options['filters']['name']['table'] = 'farm_plan'; @@ -188,7 +171,6 @@ function farm_plan_views_default_views() { t('Name'), t('Plan type'), t('Active'), - t('Type'), t('Page'), ); $export['farm_plan'] = $view; @@ -236,7 +218,8 @@ function farm_plan_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -244,28 +227,28 @@ function farm_plan_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -282,7 +265,7 @@ function farm_plan_views_default_views() { 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -458,26 +441,6 @@ function farm_plan_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* Contextual filter: Farm plan records: Plan ID */ $handler->display->display_options['arguments']['plan_id']['id'] = 'plan_id'; $handler->display->display_options['arguments']['plan_id']['table'] = 'farm_plan_log'; diff --git a/modules/farm/farm_quantity/farm_quantity_report/farm_quantity_report.views_default.inc b/modules/farm/farm_quantity/farm_quantity_report/farm_quantity_report.views_default.inc index 983006567..13a6e03d9 100644 --- a/modules/farm/farm_quantity/farm_quantity_report/farm_quantity_report.views_default.inc +++ b/modules/farm/farm_quantity/farm_quantity_report/farm_quantity_report.views_default.inc @@ -57,45 +57,46 @@ function farm_quantity_report_views_default_views() { 'field_farm_quantity_units' => 'field_farm_quantity_units', 'field_farm_quantity_label' => 'field_farm_quantity_label', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'item_id' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'type' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -122,28 +123,28 @@ function farm_quantity_report_views_default_views() { 'empty_column' => 0, ), 'field_farm_quantity_measure' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_value' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_units' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_quantity_label' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -260,46 +261,6 @@ function farm_quantity_report_views_default_views() { $handler->display->display_options['fields']['field_farm_quantity_label']['id'] = 'field_farm_quantity_label'; $handler->display->display_options['fields']['field_farm_quantity_label']['table'] = 'field_data_field_farm_quantity_label'; $handler->display->display_options['fields']['field_farm_quantity_label']['field'] = 'field_farm_quantity_label'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['relationship'] = 'field_farm_quantity_log'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* Sort criterion: Field collection item: Measure (field_farm_quantity_measure) */ - $handler->display->display_options['sorts']['field_farm_quantity_measure_value']['id'] = 'field_farm_quantity_measure_value'; - $handler->display->display_options['sorts']['field_farm_quantity_measure_value']['table'] = 'field_data_field_farm_quantity_measure'; - $handler->display->display_options['sorts']['field_farm_quantity_measure_value']['field'] = 'field_farm_quantity_measure_value'; - $handler->display->display_options['sorts']['field_farm_quantity_measure_value']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_quantity_measure_value']['expose']['label'] = 'Measure'; - /* Sort criterion: Field: Value (decimal) */ - $handler->display->display_options['sorts']['field_farm_quantity_value_decimal']['id'] = 'field_farm_quantity_value_decimal'; - $handler->display->display_options['sorts']['field_farm_quantity_value_decimal']['table'] = 'field_data_field_farm_quantity_value'; - $handler->display->display_options['sorts']['field_farm_quantity_value_decimal']['field'] = 'field_farm_quantity_value_decimal'; - $handler->display->display_options['sorts']['field_farm_quantity_value_decimal']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_quantity_value_decimal']['expose']['label'] = 'Quantity value'; - /* Sort criterion: Field: Units (field_farm_quantity_units) */ - $handler->display->display_options['sorts']['field_farm_quantity_units_tid']['id'] = 'field_farm_quantity_units_tid'; - $handler->display->display_options['sorts']['field_farm_quantity_units_tid']['table'] = 'field_data_field_farm_quantity_units'; - $handler->display->display_options['sorts']['field_farm_quantity_units_tid']['field'] = 'field_farm_quantity_units_tid'; - $handler->display->display_options['sorts']['field_farm_quantity_units_tid']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_quantity_units_tid']['expose']['label'] = 'Units'; - /* Sort criterion: Field collection item: Label (field_farm_quantity_label) */ - $handler->display->display_options['sorts']['field_farm_quantity_label_value']['id'] = 'field_farm_quantity_label_value'; - $handler->display->display_options['sorts']['field_farm_quantity_label_value']['table'] = 'field_data_field_farm_quantity_label'; - $handler->display->display_options['sorts']['field_farm_quantity_label_value']['field'] = 'field_farm_quantity_label_value'; - $handler->display->display_options['sorts']['field_farm_quantity_label_value']['exposed'] = TRUE; - $handler->display->display_options['sorts']['field_farm_quantity_label_value']['expose']['label'] = 'Label'; - /* Sort criterion: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['relationship'] = 'field_farm_quantity_log'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* Filter criterion: Field collection item: Field name */ $handler->display->display_options['filters']['field_name']['id'] = 'field_name'; $handler->display->display_options['filters']['field_name']['table'] = 'field_collection_item'; @@ -521,7 +482,6 @@ function farm_quantity_report_views_default_views() { t('Quantity'), t('Units'), t('Label'), - t('Quantity value'), t('Asset name'), t('Asset type'), t('Value'), diff --git a/modules/farm/farm_sensor/farm_sensor.views_default.inc b/modules/farm/farm_sensor/farm_sensor.views_default.inc index cb72ed9c2..85f3561e6 100644 --- a/modules/farm/farm_sensor/farm_sensor.views_default.inc +++ b/modules/farm/farm_sensor/farm_sensor.views_default.inc @@ -49,7 +49,8 @@ function farm_sensor_views_default_views() { 'field_farm_move_to' => 'field_farm_move_to', 'archived' => 'archived', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -57,21 +58,21 @@ function farm_sensor_views_default_views() { 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_description' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -93,8 +94,8 @@ function farm_sensor_views_default_views() { 'empty_column' => 0, ), 'archived' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -242,19 +243,6 @@ function farm_sensor_views_default_views() { $handler->display->display_options['fields']['archived']['date_format'] = 'custom'; $handler->display->display_options['fields']['archived']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['archived']['second_date_format'] = 'long'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Field collection item: Movement to (field_farm_move_to) */ $handler->display->display_options['arguments']['field_farm_move_to_tid']['id'] = 'field_farm_move_to_tid'; $handler->display->display_options['arguments']['field_farm_move_to_tid']['table'] = 'field_data_field_farm_move_to'; diff --git a/modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.views_default.inc b/modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.views_default.inc index f7d1e7269..7a8167aef 100644 --- a/modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.views_default.inc +++ b/modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.views_default.inc @@ -41,12 +41,29 @@ function farm_sensor_listener_views_default_views() { $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = TRUE; $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['columns'] = array( - 'id' => 'id', + 'timestamp' => 'timestamp', + 'name' => 'name', + 'value_decimal' => 'value_decimal', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( - 'id' => array( - 'sortable' => 0, + 'timestamp' => array( + 'sortable' => 1, + 'default_sort_order' => 'desc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'name' => array( + 'sortable' => 1, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'value_decimal' => array( + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -80,25 +97,6 @@ function farm_sensor_listener_views_default_views() { $handler->display->display_options['fields']['value_decimal']['field'] = 'value_decimal'; $handler->display->display_options['fields']['value_decimal']['label'] = 'Sensor value'; $handler->display->display_options['fields']['value_decimal']['precision'] = '0'; - /* Sort criterion: Sensor data: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'farm_sensor_data'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Timestamp'; - /* Sort criterion: Sensor data: Sensor reading name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_sensor_data'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Sensor data: Sensor value (decimal) */ - $handler->display->display_options['sorts']['value_decimal']['id'] = 'value_decimal'; - $handler->display->display_options['sorts']['value_decimal']['table'] = 'farm_sensor_data'; - $handler->display->display_options['sorts']['value_decimal']['field'] = 'value_decimal'; - $handler->display->display_options['sorts']['value_decimal']['exposed'] = TRUE; - $handler->display->display_options['sorts']['value_decimal']['expose']['label'] = 'Value'; /* Contextual filter: Farm asset: Farm asset ID */ $handler->display->display_options['arguments']['id']['id'] = 'id'; $handler->display->display_options['arguments']['id']['table'] = 'farm_asset'; diff --git a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.views_default.inc b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.views_default.inc index 35316a32e..c93211e03 100644 --- a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.views_default.inc +++ b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.views_default.inc @@ -50,7 +50,8 @@ function farm_soil_compost_views_default_views() { 'field_farm_move_to' => 'field_farm_move_to', 'archived' => 'archived', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'name'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -58,8 +59,8 @@ function farm_soil_compost_views_default_views() { 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -70,14 +71,14 @@ function farm_soil_compost_views_default_views() { 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_description' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -99,8 +100,8 @@ function farm_soil_compost_views_default_views() { 'empty_column' => 0, ), 'archived' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, @@ -261,19 +262,6 @@ function farm_soil_compost_views_default_views() { $handler->display->display_options['fields']['archived']['date_format'] = 'custom'; $handler->display->display_options['fields']['archived']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['archived']['second_date_format'] = 'long'; - /* Sort criterion: Farm asset: Name */ - $handler->display->display_options['sorts']['name']['id'] = 'name'; - $handler->display->display_options['sorts']['name']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['name']['field'] = 'name'; - $handler->display->display_options['sorts']['name']['exposed'] = TRUE; - $handler->display->display_options['sorts']['name']['expose']['label'] = 'Name'; - /* Sort criterion: Farm asset: Farm asset ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'farm_asset'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Asset ID'; /* Contextual filter: Field collection item: Movement to (field_farm_move_to) */ $handler->display->display_options['arguments']['field_farm_move_to_tid']['id'] = 'field_farm_move_to_tid'; $handler->display->display_options['arguments']['field_farm_move_to_tid']['table'] = 'field_data_field_farm_move_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 65f2911a8..386db8c70 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 @@ -53,7 +53,8 @@ function farm_soil_test_views_default_views() { 'field_farm_log_owner' => 'field_farm_log_owner', 'field_farm_files' => 'field_farm_files', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -61,35 +62,35 @@ function farm_soil_test_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_soil_lab' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -101,7 +102,7 @@ function farm_soil_test_views_default_views() { 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -291,26 +292,6 @@ function farm_soil_test_views_default_views() { $handler->display->display_options['fields']['field_farm_files']['click_sort_column'] = 'fid'; $handler->display->display_options['fields']['field_farm_files']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_farm_files']['multi_type'] = 'ul'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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']['table'] = 'field_data_field_farm_area'; 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 b6e0ed514..79ea40ede 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 @@ -52,7 +52,8 @@ function farm_water_test_views_default_views() { 'field_farm_log_category' => 'field_farm_log_category', 'field_farm_log_owner' => 'field_farm_log_owner', ); - $handler->display->display_options['style_options']['default'] = '-1'; + $handler->display->display_options['style_options']['class'] = ''; + $handler->display->display_options['style_options']['default'] = 'timestamp'; $handler->display->display_options['style_options']['info'] = array( 'views_bulk_operations' => array( 'align' => '', @@ -60,28 +61,28 @@ function farm_water_test_views_default_views() { 'empty_column' => 0, ), 'done' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'id' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'timestamp' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', + 'sortable' => 1, + 'default_sort_order' => 'desc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'name' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -93,14 +94,14 @@ function farm_water_test_views_default_views() { 'empty_column' => 0, ), 'field_farm_water_lab' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), 'field_farm_notes' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', @@ -277,26 +278,6 @@ function farm_water_test_views_default_views() { 'link' => 0, ); $handler->display->display_options['fields']['field_farm_log_owner']['delta_offset'] = '0'; - /* Sort criterion: Log: Timestamp */ - $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['table'] = 'log'; - $handler->display->display_options['sorts']['timestamp']['field'] = 'timestamp'; - $handler->display->display_options['sorts']['timestamp']['order'] = 'DESC'; - $handler->display->display_options['sorts']['timestamp']['exposed'] = TRUE; - $handler->display->display_options['sorts']['timestamp']['expose']['label'] = 'Date'; - /* 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: Log: Log ID */ - $handler->display->display_options['sorts']['id']['id'] = 'id'; - $handler->display->display_options['sorts']['id']['table'] = 'log'; - $handler->display->display_options['sorts']['id']['field'] = 'id'; - $handler->display->display_options['sorts']['id']['order'] = 'DESC'; - $handler->display->display_options['sorts']['id']['exposed'] = TRUE; - $handler->display->display_options['sorts']['id']['expose']['label'] = 'Log ID'; /* 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']['table'] = 'field_data_field_farm_area'; diff --git a/themes/farm_theme/css/style.css b/themes/farm_theme/css/style.css index 8e2f86cb7..72e0dd676 100644 --- a/themes/farm_theme/css/style.css +++ b/themes/farm_theme/css/style.css @@ -186,7 +186,7 @@ h2.resp-tab-active, } /** - * Fix Views exposed filter/sort. + * Fix Views exposed filters. */ .views-exposed-form .views-exposed-widget .form-submit { margin-top: 1.6em; diff --git a/themes/farm_theme/template.php b/themes/farm_theme/template.php index e1a0605ea..28927e60a 100644 --- a/themes/farm_theme/template.php +++ b/themes/farm_theme/template.php @@ -137,12 +137,6 @@ function farm_theme_form_views_exposed_form_alter(&$form, &$form_state, $form_id // Collapse by default. $collapse = TRUE; - // If the form was submitted (if there are values in $_GET other than 'q'), - // do not collapse the form. - if (count($_GET) > 1) { - $collapse = FALSE; - } - // Set attributes depending on the collapsed state (used in HTML below). if ($collapse) { $collapse_class = ''; @@ -158,7 +152,7 @@ function farm_theme_form_views_exposed_form_alter(&$form, &$form_state, $form_id