Project

General

Profile

Revision eafb60f0

IDeafb60f08b76e3b1ecd17f5335e27d44c92dc059
Parent be02a7ab
Child 3eae339f, 74dcb4d4

Added by Andreas Kohlbecker over 2 years ago

fix #7417 defaults for TAXON_RELATIONSHIP_TYPES - bugfix

View differences:

modules/cdm_dataportal/settings.php
51 51
  /* taxonRelationshipTypes */
52 52
  define('CDM_TAXON_RELATIONSHIP_TYPES_DEFAULT', serialize(
53 53
    array(
54
      UUID_MISAPPLIED_NAME_FOR,
55
      UUID_PROPARTE_MISAPPLIEDNAME_FOR,
56
      UUID_PARTIAL_MISAPPLIEDNAME_FOR,
57
      UUID_PROPARTE_SYNONYM_FOR,
58
      UUID_PARTIAL_SYNONYM_FOR,
59
      UUID_INVALID_DESIGNATION_FOR
54
      UUID_MISAPPLIED_NAME_FOR => UUID_MISAPPLIED_NAME_FOR,
55
      UUID_PROPARTE_MISAPPLIEDNAME_FOR => UUID_PROPARTE_MISAPPLIEDNAME_FOR,
56
      UUID_PARTIAL_MISAPPLIEDNAME_FOR => UUID_PARTIAL_MISAPPLIEDNAME_FOR,
57
      UUID_PROPARTE_SYNONYM_FOR => UUID_PROPARTE_SYNONYM_FOR,
58
      UUID_PARTIAL_SYNONYM_FOR => UUID_PARTIAL_SYNONYM_FOR,
59
      UUID_INVALID_DESIGNATION_FOR => UUID_INVALID_DESIGNATION_FOR
60 60
    )
61 61
  ));
62 62

  
......
2491 2491
      below selected taxon relationships of accepted taxa.'),
2492 2492
  );
2493 2493

  
2494
  $taxonRelationshipTypeOptions = cdm_vocabulary_as_option(UUID_TAXON_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
2494
  $taxon_relationship_type_options = cdm_vocabulary_as_option(UUID_TAXON_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
2495
  $taxon_relationship_type_defaults = variable_get(CDM_TAXON_RELATIONSHIP_TYPES, unserialize(CDM_TAXON_RELATIONSHIP_TYPES_DEFAULT));
2495 2496
  $form['taxon_synonymy']['taxon_relations'][CDM_TAXON_RELATIONSHIP_TYPES] = array(
2496 2497
    '#type' => 'checkboxes',
2497 2498
    '#title' => t('Taxon relationship types') . ':',
2498 2499
    '#description' => t('Only taxon relationships of the selected type will be
2499 2500
      displayed'),
2500
    '#options' => $taxonRelationshipTypeOptions,
2501
    '#default_value' => variable_get(CDM_TAXON_RELATIONSHIP_TYPES, unserialize(CDM_TAXON_RELATIONSHIP_TYPES_DEFAULT)),
2501
    '#options' => $taxon_relationship_type_options,
2502
    '#default_value' => $taxon_relationship_type_defaults,
2502 2503
    '#disabled' => !variable_get(CDM_DATAPORTAL_DISPLAY_TAXON_RELATIONSHIPS, CDM_DATAPORTAL_DISPLAY_TAXON_RELATIONSHIPS_DEFAULT),
2503 2504
  );
2504 2505

  
......
2509 2510
    '#collapsed' => FALSE
2510 2511
  );
2511 2512

  
2512
  $taxonRelationshipTypeOptions = cdm_vocabulary_as_option(UUID_NAME_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
2513
  $name_relationship_type_options = cdm_vocabulary_as_option(UUID_NAME_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
2513 2514
  $form['taxon_synonymy']['name_relations'][CDM_NAME_RELATIONSHIP_TYPES] = array(
2514 2515
    '#type' => 'checkboxes',
2515 2516
    '#title' => t('Name relationship types') . ':',
2516 2517
    '#description' => t('Only name relationships of the selected type will be
2517 2518
      displayed'),
2518
    '#options' => $taxonRelationshipTypeOptions,
2519
    '#options' => $name_relationship_type_options,
2519 2520
    '#default_value' => variable_get(CDM_NAME_RELATIONSHIP_TYPES, unserialize(CDM_NAME_RELATIONSHIP_TYPES_DEFAULT)),
2520 2521
  );
2521 2522

  

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)