From 0fe89b3737cba2900c87d11ac630140b4dfba12c Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 8 Aug 2014 07:39:34 -0500
Subject: [PATCH] Issue #1870866 by wiifm, magunz | jfarry: Fixed "Please
insert the items per page (**) from above." doesn't make much sense.
---
.../config/install/views.view.aggregator_rss_feed.yml | 2 +-
.../test_views/views.view.test_comment_row.yml | 2 +-
core/modules/file/config/install/views.view.files.yml | 4 ++--
core/modules/node/config/install/views.view.archive.yml | 2 +-
core/modules/node/config/install/views.view.frontpage.yml | 2 +-
core/modules/node/config/install/views.view.glossary.yml | 2 +-
.../test_views/views.view.test_contextual_links.yml | 2 +-
.../test_views/views.view.test_node_view.yml | 2 +-
.../taxonomy/config/install/views.view.taxonomy_term.yml | 4 ++--
.../views.view.test_filter_taxonomy_index_tid.yml | 2 +-
.../test_views/views.view.test_taxonomy_parent.yml | 2 +-
.../user/config/install/views.view.user_admin_people.yml | 2 +-
core/modules/views/src/Plugin/views/pager/SqlBase.php | 6 +++---
.../test_views/views.view.test_mini_pager.yml | 2 +-
14 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml
index f7a9499a58f2..a88b35f08910 100644
--- a/core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml
+++ b/core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml
@@ -48,7 +48,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml
index 37f34fa7a053..c8e296491c96 100644
--- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml
+++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml
@@ -52,7 +52,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/file/config/install/views.view.files.yml b/core/modules/file/config/install/views.view.files.yml
index ccd4d1af389c..41ebb4cee912 100644
--- a/core/modules/file/config/install/views.view.files.yml
+++ b/core/modules/file/config/install/views.view.files.yml
@@ -52,7 +52,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
@@ -721,7 +721,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/node/config/install/views.view.archive.yml b/core/modules/node/config/install/views.view.archive.yml
index e83b8e17b763..58be6c3b79fc 100644
--- a/core/modules/node/config/install/views.view.archive.yml
+++ b/core/modules/node/config/install/views.view.archive.yml
@@ -49,7 +49,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/node/config/install/views.view.frontpage.yml b/core/modules/node/config/install/views.view.frontpage.yml
index a7f8a281d357..1e27e9ce40d5 100644
--- a/core/modules/node/config/install/views.view.frontpage.yml
+++ b/core/modules/node/config/install/views.view.frontpage.yml
@@ -170,7 +170,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/node/config/install/views.view.glossary.yml b/core/modules/node/config/install/views.view.glossary.yml
index a9b86a12a07e..ba9126b665aa 100644
--- a/core/modules/node/config/install/views.view.glossary.yml
+++ b/core/modules/node/config/install/views.view.glossary.yml
@@ -49,7 +49,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml
index 5b3b4f442e3e..8aaab2c2b3bc 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml
@@ -23,7 +23,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: '0'
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml
index b97e5f23b0e2..4bc240e83691 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml
@@ -52,7 +52,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: '0'
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml b/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
index 2f71051e16bd..b008800f93e1 100644
--- a/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
+++ b/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
@@ -48,7 +48,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
@@ -210,7 +210,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml
index 5a60315ffa8e..a73c238e34ce 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml
@@ -45,7 +45,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: 0
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml
index b03da88097a8..8e9e5a4f0111 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml
@@ -50,7 +50,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/user/config/install/views.view.user_admin_people.yml b/core/modules/user/config/install/views.view.user_admin_people.yml
index 963303fe163a..90a1a6588688 100644
--- a/core/modules/user/config/install/views.view.user_admin_people.yml
+++ b/core/modules/user/config/install/views.view.user_admin_people.yml
@@ -53,7 +53,7 @@ display:
expose:
items_per_page: false
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
diff --git a/core/modules/views/src/Plugin/views/pager/SqlBase.php b/core/modules/views/src/Plugin/views/pager/SqlBase.php
index c38edd9fb817..3b6b8e5f7aa9 100644
--- a/core/modules/views/src/Plugin/views/pager/SqlBase.php
+++ b/core/modules/views/src/Plugin/views/pager/SqlBase.php
@@ -24,7 +24,7 @@ protected function defineOptions() {
'contains' => array(
'items_per_page' => array('default' => FALSE, 'bool' => TRUE),
'items_per_page_label' => array('default' => 'Items per page', 'translatable' => TRUE),
- 'items_per_page_options' => array('default' => '5, 10, 20, 40, 60'),
+ 'items_per_page_options' => array('default' => '5, 10, 25, 50'),
'items_per_page_options_all' => array('default' => FALSE, 'bool' => TRUE),
'items_per_page_options_all_label' => array('default' => '- All -', 'translatable' => TRUE),
@@ -204,8 +204,8 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) {
if (!empty($form_state['values']['pager_options']['expose']['items_per_page']) && !empty($form_state['values']['pager_options']['items_per_page'])) {
$items_per_page = $form_state['values']['pager_options']['items_per_page'];
if (array_search($items_per_page, $options) === FALSE) {
- form_set_error('pager_options][expose][items_per_page_options', $form_state, t('Insert the items per page (@items_per_page) from above.',
- array('@items_per_page' => $items_per_page))
+ form_set_error('pager_options][expose][items_per_page_options', $form_state, t("The <em>Exposed items per page</em> field's options must include the value from the <em>Items per page</em> field (@items_per_page).",
+ array('@items_per_page' => $items_per_page))
);
}
}
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
index d1f5552edda4..5409539b1066 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
@@ -32,7 +32,7 @@ display:
expose:
items_per_page: '0'
items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 20, 40, 60'
+ items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: '0'
items_per_page_options_all_label: '- All -'
offset: '0'
--
GitLab