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

#664920 by catch and chx: Change 'taxonomy_term()' field to 'taxonomy_term_reference()'.

merge-requests/26/head
Angie Byron 2010-01-04 18:03:12 +00:00
parent 1dc503a56a
commit c4962c9756
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/rdf/rdf.module
View File

@ -580,7 +580,7 @@ function rdf_field_attach_view_alter(&$output, $context) {
// Append term mappings on displayed taxonomy links. // Append term mappings on displayed taxonomy links.
foreach (element_children($output) as $field_name) { foreach (element_children($output) as $field_name) {
$element = &$output[$field_name]; $element = &$output[$field_name];
if ($element['#field_type'] == 'taxonomy_term' && $element['#formatter'] == 'taxonomy_term_link') { if ($element['#field_type'] == 'taxonomy_term_reference' && $element['#formatter'] == 'taxonomy_term_reference_link') {
foreach ($element['#items'] as $delta => $item) { foreach ($element['#items'] as $delta => $item) {
$term = $item['taxonomy_term']; $term = $item['taxonomy_term'];
if (!empty($term->rdf_mapping['rdftype'])) { if (!empty($term->rdf_mapping['rdftype'])) {

30
modules/taxonomy/taxonomy.module
View File

@ -424,7 +424,7 @@ function taxonomy_check_vocabulary_hierarchy($vocabulary, $changed_term) {
function taxonomy_vocabulary_create_field($vocabulary) { function taxonomy_vocabulary_create_field($vocabulary) {
$field = array( $field = array(
'field_name' => 'taxonomy_' . $vocabulary->machine_name, 'field_name' => 'taxonomy_' . $vocabulary->machine_name,
'type' => 'taxonomy_term', 'type' => 'taxonomy_term_reference',
// Set cardinality to unlimited so that select // Set cardinality to unlimited so that select
// and autocomplete widgets behave as normal. // and autocomplete widgets behave as normal.
'cardinality' => FIELD_CARDINALITY_UNLIMITED, 'cardinality' => FIELD_CARDINALITY_UNLIMITED,
@ -953,11 +953,11 @@ function taxonomy_implode_tags($tags, $vid = NULL) {
*/ */
function taxonomy_field_info() { function taxonomy_field_info() {
return array( return array(
'taxonomy_term' => array( 'taxonomy_term_reference' => array(
'label' => t('Taxonomy term'), 'label' => t('Term reference'),
'description' => t('This field stores a reference to a taxonomy term.'), 'description' => t('This field stores a reference to a taxonomy term.'),
'default_widget' => 'options_select', 'default_widget' => 'options_select',
'default_formatter' => 'taxonomy_term_link', 'default_formatter' => 'taxonomy_term_reference_link',
'settings' => array( 'settings' => array(
'allowed_values' => array( 'allowed_values' => array(
array( array(
@ -977,7 +977,7 @@ function taxonomy_field_widget_info() {
return array( return array(
'taxonomy_autocomplete' => array( 'taxonomy_autocomplete' => array(
'label' => t('Autocomplete term widget (tagging)'), 'label' => t('Autocomplete term widget (tagging)'),
'field types' => array('taxonomy_term'), 'field types' => array('taxonomy_term_reference'),
'settings' => array( 'settings' => array(
'size' => 60, 'size' => 60,
'autocomplete_path' => 'taxonomy/autocomplete', 'autocomplete_path' => 'taxonomy/autocomplete',
@ -993,8 +993,8 @@ function taxonomy_field_widget_info() {
* Implements hook_field_widget_info_alter(). * Implements hook_field_widget_info_alter().
*/ */
function taxonomy_field_widget_info_alter(&$info) { function taxonomy_field_widget_info_alter(&$info) {
$info['options_select']['field types'][] = 'taxonomy_term'; $info['options_select']['field types'][] = 'taxonomy_term_reference';
$info['options_buttons']['field types'][] = 'taxonomy_term'; $info['options_buttons']['field types'][] = 'taxonomy_term_reference';
} }
/** /**
@ -1036,7 +1036,7 @@ function taxonomy_field_validate($obj_type, $object, $field, $instance, $langcod
if (!empty($item['tid'])) { if (!empty($item['tid'])) {
if (!isset($allowed_values[$item['tid']])) { if (!isset($allowed_values[$item['tid']])) {
$errors[$field['field_name']][$langcode][$delta][] = array( $errors[$field['field_name']][$langcode][$delta][] = array(
'error' => 'taxonomy_term_illegal_value', 'error' => 'taxonomy_term_reference_illegal_value',
'message' => t('%name: illegal value.', array('%name' => t($instance['label']))), 'message' => t('%name: illegal value.', array('%name' => t($instance['label']))),
); );
} }
@ -1059,13 +1059,13 @@ function taxonomy_field_is_empty($item, $field) {
*/ */
function taxonomy_field_formatter_info() { function taxonomy_field_formatter_info() {
return array( return array(
'taxonomy_term_link' => array( 'taxonomy_term_reference_link' => array(
'label' => t('Link'), 'label' => t('Link'),
'field types' => array('taxonomy_term'), 'field types' => array('taxonomy_term_reference'),
), ),
'taxonomy_term_plain' => array( 'taxonomy_term_reference_plain' => array(
'label' => t('Plain text'), 'label' => t('Plain text'),
'field types' => array('taxonomy_term'), 'field types' => array('taxonomy_term_reference'),
), ),
); );
} }
@ -1077,7 +1077,7 @@ function taxonomy_field_formatter_view($object_type, $object, $field, $instance,
$element = array(); $element = array();
switch ($display['type']) { switch ($display['type']) {
case 'taxonomy_term_link': case 'taxonomy_term_reference_link':
foreach ($items as $delta => $item) { foreach ($items as $delta => $item) {
$term = $item['taxonomy_term']; $term = $item['taxonomy_term'];
$element[$delta] = array( $element[$delta] = array(
@ -1088,7 +1088,7 @@ function taxonomy_field_formatter_view($object_type, $object, $field, $instance,
} }
break; break;
case 'taxonomy_term_plain': case 'taxonomy_term_reference_plain':
foreach ($items as $delta => $item) { foreach ($items as $delta => $item) {
$term = $item['taxonomy_term']; $term = $item['taxonomy_term'];
$element[$delta] = array( $element[$delta] = array(
@ -1173,7 +1173,7 @@ function _taxonomy_clean_field_cache($term) {
} }
// Load info for all taxonomy term fields. // Load info for all taxonomy term fields.
$fields = field_read_fields(array('type' => 'taxonomy_term')); $fields = field_read_fields(array('type' => 'taxonomy_term_reference'));
foreach ($fields as $field_name => $field) { foreach ($fields as $field_name => $field) {
// Assemble an array of vocabulary IDs that are used in this field. // Assemble an array of vocabulary IDs that are used in this field.

10
modules/taxonomy/taxonomy.test
View File

@ -332,7 +332,7 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
), ),
'display' => array( 'display' => array(
'full' => array( 'full' => array(
'type' => 'taxonomy_term_link', 'type' => 'taxonomy_term_reference_link',
), ),
), ),
); );
@ -703,7 +703,7 @@ class TaxonomyTermFieldTestCase extends TaxonomyWebTestCase {
public static function getInfo() { public static function getInfo() {
return array( return array(
'name' => 'Taxonomy term field', 'name' => 'Taxonomy term reference field',
'description' => 'Test the creation of term fields.', 'description' => 'Test the creation of term fields.',
'group' => 'Taxonomy', 'group' => 'Taxonomy',
); );
@ -726,7 +726,7 @@ class TaxonomyTermFieldTestCase extends TaxonomyWebTestCase {
// Create a field with settings to validate. // Create a field with settings to validate.
$this->field = array( $this->field = array(
'field_name' => $this->field_name, 'field_name' => $this->field_name,
'type' => 'taxonomy_term', 'type' => 'taxonomy_term_reference',
'settings' => array( 'settings' => array(
'allowed_values' => array( 'allowed_values' => array(
array( array(
@ -746,7 +746,7 @@ class TaxonomyTermFieldTestCase extends TaxonomyWebTestCase {
), ),
'display' => array( 'display' => array(
'full' => array( 'full' => array(
'type' => 'taxonomy_term_link', 'type' => 'taxonomy_term_reference_link',
), ),
), ),
); );
@ -786,7 +786,7 @@ class TaxonomyTermFieldTestCase extends TaxonomyWebTestCase {
$this->field_name = drupal_strtolower($this->randomName()); $this->field_name = drupal_strtolower($this->randomName());
$this->field = array( $this->field = array(
'field_name' => $this->field_name, 'field_name' => $this->field_name,
'type' => 'taxonomy_term', 'type' => 'taxonomy_term_reference',
'settings' => array( 'settings' => array(
'allowed_values' => array( 'allowed_values' => array(
array( array(