Skip to content
Snippets Groups Projects
Verified Commit 3da8c309 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3320721 by ranjith_kumar_k_u, martins.bertins, Manibharathi E R,...

Issue #3320721 by ranjith_kumar_k_u, martins.bertins, Manibharathi E R, smustgrave, Lendude: The active page number is not showing on the last page(Views Full pager)
parent 11ac8359
No related branches found
No related tags found
No related merge requests found
...@@ -1814,27 +1814,25 @@ function template_preprocess_pager(&$variables) { ...@@ -1814,27 +1814,25 @@ function template_preprocess_pager(&$variables) {
} }
} }
if ($i != $pager_max) { // Add an ellipsis if there are further previous pages.
// Add an ellipsis if there are further previous pages. if ($i > 1) {
if ($i > 1) { $variables['ellipses']['previous'] = TRUE;
$variables['ellipses']['previous'] = TRUE; }
} // Now generate the actual pager piece.
// Now generate the actual pager piece. for (; $i <= $pager_last && $i <= $pager_max; $i++) {
for (; $i <= $pager_last && $i <= $pager_max; $i++) { $options = [
$options = [ 'query' => $pager_manager->getUpdatedParameters($parameters, $element, $i - 1),
'query' => $pager_manager->getUpdatedParameters($parameters, $element, $i - 1), ];
]; $items['pages'][$i]['href'] = Url::fromRoute($route_name, $route_parameters, $options)->toString();
$items['pages'][$i]['href'] = Url::fromRoute($route_name, $route_parameters, $options)->toString(); $items['pages'][$i]['attributes'] = new Attribute();
$items['pages'][$i]['attributes'] = new Attribute(); if ($i == $pager_current) {
if ($i == $pager_current) { $variables['current'] = $i;
$variables['current'] = $i;
}
}
// Add an ellipsis if there are further next pages.
if ($i < $pager_max + 1) {
$variables['ellipses']['next'] = TRUE;
} }
} }
// Add an ellipsis if there are further next pages.
if ($i < $pager_max + 1) {
$variables['ellipses']['next'] = TRUE;
}
// Create the "next" and "last" links if we are not on the last page. // Create the "next" and "last" links if we are not on the last page.
if ($current_page < ($pager_max - 1)) { if ($current_page < ($pager_max - 1)) {
......
...@@ -351,6 +351,22 @@ public function testNormalPager() { ...@@ -351,6 +351,22 @@ public function testNormalPager() {
// Test pager cache contexts. // Test pager cache contexts.
$this->drupalGet('test_pager_full'); $this->drupalGet('test_pager_full');
$this->assertCacheContexts(['languages:language_interface', 'theme', 'timezone', 'url.query_args', 'user.node_grants:view']); $this->assertCacheContexts(['languages:language_interface', 'theme', 'timezone', 'url.query_args', 'user.node_grants:view']);
// Set "Number of pager links visible" to 1 and check the active page number
// on the last page.
$view = Views::getView('test_pager_full');
$view->setDisplay();
$pager = [
'type' => 'full',
'options' => [
'items_per_page' => 5,
'quantity' => 1,
],
];
$view->display_handler->setOption('pager', $pager);
$view->save();
$this->drupalGet('test_pager_full', ['query' => ['page' => 2]]);
$this->assertEquals('Current page 3', $this->assertSession()->elementExists('css', '.pager__items li.is-active')->getText());
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment