Commit 0fe89b37 authored by alexpott's avatar alexpott

Issue #1870866 by wiifm, magunz | jfarry: Fixed "Please insert the items per...

Issue #1870866 by wiifm, magunz | jfarry: Fixed "Please insert the items per page (**) from above." doesn't make much sense.
parent 933b8fac
...@@ -48,7 +48,7 @@ display: ...@@ -48,7 +48,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -52,7 +52,7 @@ display: ...@@ -52,7 +52,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -52,7 +52,7 @@ display: ...@@ -52,7 +52,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
...@@ -721,7 +721,7 @@ display: ...@@ -721,7 +721,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -49,7 +49,7 @@ display: ...@@ -49,7 +49,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -170,7 +170,7 @@ display: ...@@ -170,7 +170,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -49,7 +49,7 @@ display: ...@@ -49,7 +49,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -23,7 +23,7 @@ display: ...@@ -23,7 +23,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: '0'
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -52,7 +52,7 @@ display: ...@@ -52,7 +52,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: '0'
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -48,7 +48,7 @@ display: ...@@ -48,7 +48,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
...@@ -210,7 +210,7 @@ display: ...@@ -210,7 +210,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -45,7 +45,7 @@ display: ...@@ -45,7 +45,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: 0 offset: 0
......
...@@ -50,7 +50,7 @@ display: ...@@ -50,7 +50,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -53,7 +53,7 @@ display: ...@@ -53,7 +53,7 @@ display:
expose: expose:
items_per_page: false items_per_page: false
items_per_page_label: 'Items per page' 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: false
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: false offset: false
......
...@@ -24,7 +24,7 @@ protected function defineOptions() { ...@@ -24,7 +24,7 @@ protected function defineOptions() {
'contains' => array( 'contains' => array(
'items_per_page' => array('default' => FALSE, 'bool' => TRUE), 'items_per_page' => array('default' => FALSE, 'bool' => TRUE),
'items_per_page_label' => array('default' => 'Items per page', 'translatable' => 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' => array('default' => FALSE, 'bool' => TRUE),
'items_per_page_options_all_label' => array('default' => '- All -', 'translatable' => TRUE), 'items_per_page_options_all_label' => array('default' => '- All -', 'translatable' => TRUE),
...@@ -204,7 +204,7 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) { ...@@ -204,7 +204,7 @@ 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'])) { 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']; $items_per_page = $form_state['values']['pager_options']['items_per_page'];
if (array_search($items_per_page, $options) === FALSE) { 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.', 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)) array('@items_per_page' => $items_per_page))
); );
} }
......
...@@ -32,7 +32,7 @@ display: ...@@ -32,7 +32,7 @@ display:
expose: expose:
items_per_page: '0' items_per_page: '0'
items_per_page_label: 'Items per page' 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: '0'
items_per_page_options_all_label: '- All -' items_per_page_options_all_label: '- All -'
offset: '0' offset: '0'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment