Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1958470 by olli | yuriy.babenko: Fixed Division by zero in pager_default_initialize().

8.0.x
Nathaniel Catchpole 2013-07-06 16:27:11 +01:00
parent ba3423f534
commit f24e7123e6
5 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php
View File

@ -57,7 +57,7 @@ class Mini extends SqlBase {
// Don't query for the next page if we have a pager that has a limited
// amount of pages.
if (empty($this->options['total_pages']) || ($this->getCurrentPage() < $this->options['total_pages'])) {
if ($this->getItemsPerPage() > 0 && (empty($this->options['total_pages']) || ($this->getCurrentPage() < $this->options['total_pages']))) {
// Increase the items in the query in order to be able to find out whether
// there is another page.
$limit = $this->view->query->getLimit();
@ -79,7 +79,7 @@ class Mini extends SqlBase {
public function postExecute(&$result) {
// In query() one more item might have been retrieved than necessary. If so,
// the next link needs to be displayed and the item removed.
if (count($result) > $this->getItemsPerPage()) {
if ($this->getItemsPerPage() > 0 && count($result) > $this->getItemsPerPage()) {
array_pop($result);
// Make sure the pager shows the next link by setting the total items to
// the biggest possible number but prevent failing calculations like
@ -89,7 +89,7 @@ class Mini extends SqlBase {
else {
$total = $this->getCurrentPage() * $this->getItemsPerPage() + count($result);
}
pager_default_initialize($total, $this->getItemsPerPage(), $this->options['id']);
$this->total_items = $total;
}
/**

3
core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
View File

@ -183,13 +183,12 @@ abstract class PagerPluginBase extends PluginBase {
$this->total_items -= $this->options['offset'];
}
$this->updatePageInfo();
return $this->total_items;
}
/**
* If there are pagers that need global values set, this method can
* be used to set them. It will be called when the count query is run.
* be used to set them. It will be called after the query is run.
*/
public function updatePageInfo() {

5
core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
View File

@ -1431,9 +1431,8 @@ class Sql extends QueryPluginBase {
}
$view->pager->postExecute($view->result);
if ($view->pager->useCountQuery() || !empty($view->get_total_rows)) {
$view->total_rows = $view->pager->getTotalItems();
}
$view->pager->updatePageInfo();
$view->total_rows = $view->pager->getTotalItems();
// Load all entities contained in the results.
$this->loadEntities($view->result);

9
core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php
View File

@ -91,6 +91,13 @@ class MiniPagerTest extends PluginTestBase {
$this->assertText('‹‹');
$this->assertText($this->nodes[19]->label());
$this->drupalGet('test_mini_pager_all');
$this->assertNoText('‹‹ test', 'The previous link does not appear on the page.');
$this->assertText('Page 1', 'The current page info shows the only page.');
$this->assertNoText('test ››', 'The next link does not appear on the page.');
$result = $this->xpath('//div[contains(@class, "views-row")]');
$this->assertEqual(count($result), count($this->nodes), 'All rows appear on the page.');
// Remove all items beside 1, so there should be no links shown.
for ($i = 0; $i < 19; $i++) {
$this->nodes[$i]->delete();
@ -105,7 +112,7 @@ class MiniPagerTest extends PluginTestBase {
$view = views_get_view('test_mini_pager');
$this->executeView($view);
$this->assertIdentical($view->get_total_rows, NULL, 'The query was not forced to calculate the total number of results.');
$this->assertIdentical($view->total_rows, NULL, 'The query did not return the total number of rows.');
$this->assertIdentical($view->total_rows, 1, 'The pager calculated the total number of rows.');
}
}

13
core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
View File

@ -98,6 +98,19 @@ display:
type: mini
options:
items_per_page: '1'
page_3:
display_plugin: page
id: page_3
display_title: Page
position: ''
display_options:
path: test_mini_pager_all
defaults:
pager: '0'
pager:
type: mini
options:
items_per_page: '0'
base_field: nid
status: '1'
module: views