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

Issue #1822384 by Hanspolo: Don't replace ->extra on the JoinPlugin with adjusted.

8.0.x
catch 2012-11-04 23:31:01 +00:00
parent 4e1287e693
commit a41da4e30f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php
View File

@ -165,7 +165,7 @@ class JoinPluginBase extends PluginBase {
} }
if (isset($configuration['adjusted'])) { if (isset($configuration['adjusted'])) {
$this->extra = $configuration['adjusted']; $this->adjusted = $configuration['adjusted'];
} }
$this->extraOperator = strtoupper($configuration['extra_operator']); $this->extraOperator = strtoupper($configuration['extra_operator']);

3
core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php
View File

@ -88,9 +88,12 @@ class JoinTest extends PluginTestBase {
'left_field' => 'uid', 'left_field' => 'uid',
'table' => 'users', 'table' => 'users',
'field' => 'uid', 'field' => 'uid',
'adjusted' => TRUE,
); );
$join = $this->manager->createInstance('standard', $configuration); $join = $this->manager->createInstance('standard', $configuration);
$this->assertTrue($join instanceof JoinPluginBase, 'The correct join class got loaded.'); $this->assertTrue($join instanceof JoinPluginBase, 'The correct join class got loaded.');
$this->assertNull($join->extra, 'The field extra was not overriden.');
$this->assertTrue($join->adjusted, 'The field adjusted was set correctly.');
// Build the actual join values and read them back from the dbtng query // Build the actual join values and read them back from the dbtng query
// object. // object.