Commit a8a42e62 authored by alexpott's avatar alexpott

Issue #2331793 by olli, Gábor Hojtsy: Changing pager settings for this display...

Issue #2331793 by olli, Gábor Hojtsy: Changing pager settings for this display only also changes pager settings for other display
parent 8790ec0d
......@@ -154,9 +154,6 @@ views_display:
exposed_form:
type: boolean
label: 'Exposed form style'
exposed_form_options:
type: boolean
label: 'Exposed form options'
link_display:
type: boolean
label: 'Link display'
......@@ -190,9 +187,6 @@ views_display:
filter_groups:
type: boolean
label: 'Filter groups'
pager_options:
type: boolean
label: 'Pager options'
header:
type: boolean
label: 'Header'
......@@ -234,9 +228,6 @@ views_display:
link_url:
type: string
label: 'Link URL'
pager_options:
type: boolean
label: 'Pager options'
header:
type: sequence
label: 'Header'
......
......@@ -469,11 +469,9 @@ public function defaultableSections($section = NULL) {
'style' => array('style', 'row'),
'row' => array('style', 'row'),
'pager' => array('pager', 'pager_options'),
'pager_options' => array('pager', 'pager_options'),
'pager' => array('pager'),
'exposed_form' => array('exposed_form', 'exposed_form_options'),
'exposed_form_options' => array('exposed_form', 'exposed_form_options'),
'exposed_form' => array('exposed_form'),
// These guys are special
'header' => array('header'),
......@@ -695,9 +693,6 @@ protected function defineOptions() {
);
if (!$this->usesPager()) {
$options['defaults']['default']['use_pager'] = FALSE;
$options['defaults']['default']['items_per_page'] = FALSE;
$options['defaults']['default']['offset'] = FALSE;
$options['defaults']['default']['pager'] = FALSE;
$options['pager']['contains']['type']['default'] = 'some';
}
......
......@@ -103,6 +103,12 @@ public function testStorePagerSettings() {
$this->assertText('10 items', 'The default value has been changed.');
$this->drupalGet('admin/structure/views/view/test_store_pager_settings/edit/page_1');
$this->assertText('20 items', 'The original value remains unchanged.');
// Test that the override element is only displayed on pager plugin selection form.
$this->drupalGet('admin/structure/views/nojs/display/test_store_pager_settings/page_1/pager');
$this->assertFieldByName('override[dropdown]', 'page_1', 'The override element is displayed on plugin selection form.');
$this->drupalGet('admin/structure/views/nojs/display/test_store_pager_settings/page_1/pager_options');
$this->assertNoFieldByName('override[dropdown]', NULL, 'The override element is not displayed on plugin settings form.');
}
/**
......
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