Commit e8919c6d authored by catch's avatar catch

Issue #2009680 by DarthDrupal, cwells73, Samvel, adamcowboy, hussainweb: Fixed...

Issue #2009680 by DarthDrupal, cwells73, Samvel, adamcowboy, hussainweb: Fixed Replace theme() with drupal_render() in taxonomy module.
parent 7232dbf9
<?php
/**
* @file
* Contains \Drupal\taxonomy\Tests\TaxonomyTermIndentationTest.
*/
namespace Drupal\taxonomy\Tests;
/**
* Testing term indentation functionality in term list page.
*/
class TaxonomyTermIndentationTest extends TaxonomyTestBase {
/**
* Modules to enable.
*
* @var array
*/
public static $modules = array('taxonomy');
public static function getInfo() {
return array(
'name' => 'Taxonomy term indentation',
'description' => 'Ensure that the term indentation works properly.',
'group' => 'Taxonomy',
);
}
public function setUp() {
parent::setUp();
$this->admin_user = $this->drupalCreateUser(array('administer taxonomy', 'bypass node access'));
$this->drupalLogin($this->admin_user);
$this->vocabulary = $this->createVocabulary();
}
/**
* Tests term indentation.
*/
function testTermIndentation() {
// Create three taxonomy terms.
$term1 = $this->createTerm($this->vocabulary);
$term2 = $this->createTerm($this->vocabulary);
$term3 = $this->createTerm($this->vocabulary);
// Indent the second term under the first one.
$edit = array(
'terms[tid:' . $term2->id() . ':0][term][tid]' => 2,
'terms[tid:' . $term2->id() . ':0][term][parent]' => 1,
'terms[tid:' . $term2->id() . ':0][term][depth]' => 1,
'terms[tid:' . $term2->id() . ':0][weight]' => 1,
);
// Submit the edited form and check for HTML indentation element presence.
$this->drupalPost('admin/structure/taxonomy/manage/' . $this->vocabulary->get('vid'), $edit, t('Save'));
$this->assertPattern('|<div class="indentation">&nbsp;</div>|');
}
}
...@@ -159,8 +159,15 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) { ...@@ -159,8 +159,15 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
); );
foreach ($current_page as $key => $term) { foreach ($current_page as $key => $term) {
$form['terms'][$key]['#term'] = $term; $form['terms'][$key]['#term'] = $term;
$indentation = array();
if (isset($term->depth) && $term->depth > 0) {
$indentation = array(
'#theme' => 'indentation',
'#size' => $term->depth,
);
}
$form['terms'][$key]['term'] = array( $form['terms'][$key]['term'] = array(
'#prefix' => isset($term->depth->value) && $term->depth->value > 0 ? theme('indentation', array('size' => $term->depth->value)) : '', '#prefix' => !empty($indentation) ? drupal_render($indentation) : '',
'#type' => 'link', '#type' => 'link',
'#title' => $term->label(), '#title' => $term->label(),
'#href' => "taxonomy/term/" . $term->id(), '#href' => "taxonomy/term/" . $term->id(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment