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

Issue #1000736 by fangel, stBorchert, adorsk: Fixed Term reference autocomplete widget having problems handling terms with commas.

merge-requests/26/head
webchick 2011-07-25 11:48:52 -07:00
parent 102630219a
commit bdc2373eab
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/taxonomy/taxonomy.pages.inc
View File

@ -110,7 +110,7 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
->execute() ->execute()
->fetchAllKeyed(); ->fetchAllKeyed();
$prefix = count($tags_typed) ? implode(', ', $tags_typed) . ', ' : ''; $prefix = count($tags_typed) ? drupal_implode_tags($tags_typed) . ', ' : '';
$term_matches = array(); $term_matches = array();
foreach ($tags_return as $tid => $name) { foreach ($tags_return as $tid => $name) {
@ -119,9 +119,7 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
if (strpos($name, ',') !== FALSE || strpos($name, '"') !== FALSE) { if (strpos($name, ',') !== FALSE || strpos($name, '"') !== FALSE) {
$n = '"' . str_replace('"', '""', $name) . '"'; $n = '"' . str_replace('"', '""', $name) . '"';
} }
else { $term_matches[$prefix . $n] = check_plain($name);
$term_matches[$prefix . $n] = check_plain($name);
}
} }
} }

19
modules/taxonomy/taxonomy.test
View File

@ -580,7 +580,7 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
field_create_instance($instance); field_create_instance($instance);
$terms = array( $terms = array(
$this->randomName(), $this->randomName(),
$this->randomName(), $this->randomName() . ', ' . $this->randomName(),
$this->randomName(), $this->randomName(),
); );
@ -590,7 +590,7 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
$edit["body[$langcode][0][value]"] = $this->randomName(); $edit["body[$langcode][0][value]"] = $this->randomName();
// Insert the terms in a comma separated list. Vocabulary 1 is a // Insert the terms in a comma separated list. Vocabulary 1 is a
// free-tagging field created by the default profile. // free-tagging field created by the default profile.
$edit[$instance['field_name'] . "[$langcode]"] = implode(', ', $terms); $edit[$instance['field_name'] . "[$langcode]"] = drupal_implode_tags($terms);
// Preview and verify the terms appear but are not created. // Preview and verify the terms appear but are not created.
$this->drupalPost('node/add/page', $edit, t('Preview')); $this->drupalPost('node/add/page', $edit, t('Preview'));
@ -611,9 +611,9 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
} }
// Get the created terms. // Get the created terms.
list($term1, $term2, $term3) = taxonomy_get_tree($this->vocabulary->vid); list($term1, $term2, $term3) = array_values(taxonomy_term_load_multiple(FALSE));
// Delete one term. // Delete term 1.
$this->drupalPost('taxonomy/term/' . $term1->tid . '/edit', array(), t('Delete')); $this->drupalPost('taxonomy/term/' . $term1->tid . '/edit', array(), t('Delete'));
$this->drupalPost(NULL, NULL, t('Delete')); $this->drupalPost(NULL, NULL, t('Delete'));
$term_names = array($term2->name, $term3->name); $term_names = array($term2->name, $term3->name);
@ -627,10 +627,17 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
} }
$this->assertNoText($term1->name, t('The deleted term %name does not appear on the node page.', array('%name' => $term1->name))); $this->assertNoText($term1->name, t('The deleted term %name does not appear on the node page.', array('%name' => $term1->name)));
// Test autocomplete on term 2. // Test autocomplete on term 2 - it contains a comma, so expect the key to
// be quoted.
$input = substr($term2->name, 0, 3); $input = substr($term2->name, 0, 3);
$this->drupalGet('taxonomy/autocomplete/taxonomy_' . $this->vocabulary->machine_name . '/' . $input); $this->drupalGet('taxonomy/autocomplete/taxonomy_' . $this->vocabulary->machine_name . '/' . $input);
$this->assertRaw('{"' . $term2->name . '":"' . $term2->name . '"}', t('Autocomplete returns term %term_name after typing the first 3 letters.', array('%term_name' => $term2->name))); $this->assertRaw('{"\"' . $term2->name . '\"":"' . $term2->name . '"}', t('Autocomplete returns term %term_name after typing the first 3 letters.', array('%term_name' => $term2->name)));
// Test autocomplete on term 3 - it is alphanumeric only, so no extra
// quoting.
$input = substr($term3->name, 0, 3);
$this->drupalGet('taxonomy/autocomplete/taxonomy_' . $this->vocabulary->machine_name . '/' . $input);
$this->assertRaw('{"' . $term3->name . '":"' . $term3->name . '"}', t('Autocomplete returns term %term_name after typing the first 3 letters.', array('%term_name' => $term3->name)));
} }
/** /**