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

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)

merge-requests/4106/head
Lauri Eskola 2023-06-02 10:25:42 +03:00
parent 11ac835932
commit 3da8c30968
No known key found for this signature in database
GPG Key ID: 382FC0F5B0DF53F8
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/includes/theme.inc
View File

@ -1814,27 +1814,25 @@ function template_preprocess_pager(&$variables) {
}
}
if ($i != $pager_max) {
// Add an ellipsis if there are further previous pages.
if ($i > 1) {
$variables['ellipses']['previous'] = TRUE;
}
// Now generate the actual pager piece.
for (; $i <= $pager_last && $i <= $pager_max; $i++) {
$options = [
'query' => $pager_manager->getUpdatedParameters($parameters, $element, $i - 1),
];
$items['pages'][$i]['href'] = Url::fromRoute($route_name, $route_parameters, $options)->toString();
$items['pages'][$i]['attributes'] = new Attribute();
if ($i == $pager_current) {
$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 previous pages.
if ($i > 1) {
$variables['ellipses']['previous'] = TRUE;
}
// Now generate the actual pager piece.
for (; $i <= $pager_last && $i <= $pager_max; $i++) {
$options = [
'query' => $pager_manager->getUpdatedParameters($parameters, $element, $i - 1),
];
$items['pages'][$i]['href'] = Url::fromRoute($route_name, $route_parameters, $options)->toString();
$items['pages'][$i]['attributes'] = new Attribute();
if ($i == $pager_current) {
$variables['current'] = $i;
}
}
// 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.
if ($current_page < ($pager_max - 1)) {

16
core/modules/views/tests/src/Functional/Plugin/PagerTest.php
View File

@ -351,6 +351,22 @@ class PagerTest extends ViewTestBase {
// Test pager cache contexts.
$this->drupalGet('test_pager_full');
$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());
}
/**