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

Issue #3030477 by Manuel Garcia, Anas_maw: Views filter "Published status or admin user" not checking "View any unpublished content" permission

merge-requests/1119/head
Alex Pott 2019-03-26 11:33:43 +00:00
parent 8a76eeecf6
commit cb03af1056
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/modules/content_moderation/content_moderation.views_execution.inc Normal file
View File

@ -0,0 +1,18 @@
<?php
/**
* @file
* Provide views runtime hooks for content_moderation.module.
*/
use Drupal\views\ViewExecutable;
/**
* Implements hook_views_query_substitutions().
*/
function content_moderation_views_query_substitutions(ViewExecutable $view) {
$account = \Drupal::currentUser();
return [
'***VIEW_ANY_UNPUBLISHED_NODES***' => intval($account->hasPermission('view any unpublished content')),
];
}

6
core/modules/node/src/Plugin/views/filter/Status.php
View File

@ -24,7 +24,11 @@ class Status extends FilterPluginBase {
public function query() {
$table = $this->ensureMyTable();
$this->query->addWhereExpression($this->options['group'], "$table.status = 1 OR ($table.uid = ***CURRENT_USER*** AND ***CURRENT_USER*** <> 0 AND ***VIEW_OWN_UNPUBLISHED_NODES*** = 1) OR ***BYPASS_NODE_ACCESS*** = 1");
$snippet = "$table.status = 1 OR ($table.uid = ***CURRENT_USER*** AND ***CURRENT_USER*** <> 0 AND ***VIEW_OWN_UNPUBLISHED_NODES*** = 1) OR ***BYPASS_NODE_ACCESS*** = 1";
if ($this->moduleHandler->moduleExists('content_moderation')) {
$snippet .= ' OR ***VIEW_ANY_UNPUBLISHED_NODES*** = 1';
}
$this->query->addWhereExpression($this->options['group'], $snippet);
}
/**

14
core/modules/node/tests/src/Functional/Views/StatusExtraTest.php
View File

@ -12,6 +12,11 @@ use Drupal\node\NodeInterface;
*/
class StatusExtraTest extends NodeTestBase {
/**
* {@inheritdoc}
*/
public static $modules = ['node_test_views', 'content_moderation'];
/**
* Views used by this test.
*
@ -26,6 +31,7 @@ class StatusExtraTest extends NodeTestBase {
$node_author = $this->drupalCreateUser(['view own unpublished content']);
$node_author_not_unpublished = $this->drupalCreateUser();
$normal_user = $this->drupalCreateUser();
$privileged_user = $this->drupalCreateUser(['view any unpublished content']);
$admin_user = $this->drupalCreateUser(['bypass node access']);
// Create one published and one unpublished node by the admin.
@ -47,6 +53,14 @@ class StatusExtraTest extends NodeTestBase {
$this->assertText($node_unpublished2->label());
$this->assertText($node_unpublished3->label());
// The privileged user should simply see all nodes.
$this->drupalLogin($privileged_user);
$this->drupalGet('test_status_extra');
$this->assertText($node_published->label());
$this->assertText($node_unpublished->label());
$this->assertText($node_unpublished2->label());
$this->assertText($node_unpublished3->label());
// The node author should see the published node and his own node.
$this->drupalLogin($node_author);
$this->drupalGet('test_status_extra');