From d562cd4b4a27bc75b4ee2786d7aeabfba3ad62b1 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 27 Sep 2015 15:29:31 +0200
Subject: [PATCH] Issue #2556767 by Berdir, Wim Leers: Remove placeholdering of
node links
---
core/modules/node/src/NodeViewBuilder.php | 1 -
.../config/install/statistics.settings.yml | 1 +
.../statistics/config/schema/statistics.schema.yml | 3 +++
.../statistics/src/Tests/StatisticsAdminTest.php | 13 +++++++++++++
core/modules/statistics/statistics.install | 8 ++++++++
core/modules/statistics/statistics.module | 2 ++
6 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/core/modules/node/src/NodeViewBuilder.php b/core/modules/node/src/NodeViewBuilder.php
index 37db17d379fc..3f3420ca2c03 100644
--- a/core/modules/node/src/NodeViewBuilder.php
+++ b/core/modules/node/src/NodeViewBuilder.php
@@ -41,7 +41,6 @@ public function buildComponents(array &$build, array $entities, array $displays,
$langcode,
!empty($entity->in_preview),
]],
- '#create_placeholder' => TRUE,
);
}
diff --git a/core/modules/statistics/config/install/statistics.settings.yml b/core/modules/statistics/config/install/statistics.settings.yml
index e7ae1fde461d..f788bece3faa 100644
--- a/core/modules/statistics/config/install/statistics.settings.yml
+++ b/core/modules/statistics/config/install/statistics.settings.yml
@@ -2,3 +2,4 @@ access_log:
enabled: false
max_lifetime: 259200
count_content_views: 0
+display_max_age: 3600
diff --git a/core/modules/statistics/config/schema/statistics.schema.yml b/core/modules/statistics/config/schema/statistics.schema.yml
index 81ed4381576b..d5e62008b570 100644
--- a/core/modules/statistics/config/schema/statistics.schema.yml
+++ b/core/modules/statistics/config/schema/statistics.schema.yml
@@ -17,6 +17,9 @@ statistics.settings:
count_content_views:
type: integer
label: 'Count content views'
+ display_max_age:
+ type: integer
+ label: 'How long any statistics may be cached, i.e. the refresh interval'
block.settings.statistics_popular_block:
type: block_settings
diff --git a/core/modules/statistics/src/Tests/StatisticsAdminTest.php b/core/modules/statistics/src/Tests/StatisticsAdminTest.php
index 7c4f5834555f..65ff2f0e8ea9 100644
--- a/core/modules/statistics/src/Tests/StatisticsAdminTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsAdminTest.php
@@ -47,6 +47,9 @@ class StatisticsAdminTest extends WebTestBase {
protected function setUp() {
parent::setUp();
+ // Set the max age to 0 to simplify testing.
+ $this->config('statistics.settings')->set('display_max_age', 0)->save();
+
// Create Basic page node type.
if ($this->profile != 'standard') {
$this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
@@ -89,6 +92,16 @@ function testStatisticsSettings() {
$this->drupalGet('node/' . $this->testNode->id());
$this->client->post($stats_path, array('form_params' => $post));
$this->assertText('2 views', 'Node is viewed 2 times.');
+
+ // Increase the max age to test that nodes are no longer immediately
+ // updated, visit the node once more to populate the cache.
+ $this->config('statistics.settings')->set('display_max_age', 3600)->save();
+ $this->drupalGet('node/' . $this->testNode->id());
+ $this->assertText('3 views', 'Node is viewed 3 times.');
+
+ $this->client->post($stats_path, array('form_params' => $post));
+ $this->drupalGet('node/' . $this->testNode->id());
+ $this->assertText('3 views', 'Views counter was not updated.');
}
/**
diff --git a/core/modules/statistics/statistics.install b/core/modules/statistics/statistics.install
index 4e2b26709c30..11c72f4af2e2 100644
--- a/core/modules/statistics/statistics.install
+++ b/core/modules/statistics/statistics.install
@@ -71,3 +71,11 @@ function statistics_update_8001() {
}
}
}
+
+/**
+ * Disable the Statistics module if the node module is not enabled.
+ */
+function statistics_update_8002() {
+ // Set the new configuration setting for max age to the initial value.
+ \Drupal::configFactory()->getEditable('statistics.settings')->set('display_max_age', 3600)->save();
+}
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index a1d4acde903b..910f7c6165b1 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -50,6 +50,7 @@ function statistics_node_view(array &$build, EntityInterface $node, EntityViewDi
*/
function statistics_node_links_alter(array &$node_links, NodeInterface $entity, array &$context) {
if ($context['view_mode'] != 'rss') {
+ $node_links['#cache']['contexts'][] = 'user.permissions';
if (\Drupal::currentUser()->hasPermission('view post access counter')) {
$statistics = statistics_get($entity->id());
if ($statistics) {
@@ -60,6 +61,7 @@ function statistics_node_links_alter(array &$node_links, NodeInterface $entity,
'#attributes' => array('class' => array('links', 'inline')),
);
}
+ $node_links['#cache']['max-age'] = \Drupal::config('statistics.settings')->get('display_max_age');
}
}
}
--
GitLab