Project

General

Profile

« Previous | Next » 

Revision eafb60f0

Added by Andreas Kohlbecker almost 6 years ago

fix #7417 defaults for TAXON_RELATIONSHIP_TYPES - bugfix

View differences:

modules/cdm_dataportal/cdm_api/uuids.php
43 43 
  define('UUID_PROPARTE_MISAPPLIEDNAME_FOR', 'b59b4bd2-11ff-45d1-bae2-146efdeee206');
44 44 
  define('UUID_PARTIAL_MISAPPLIEDNAME_FOR', '859fb615-b0e8-440b-866e-8a19f493cd36');
45 45 
  define('UUID_PROPARTE_SYNONYM_FOR', '8a896603-0fa3-44c6-9cd7-df2d8792e577');
46 
  define('UUID_PARTIAL_SYNONYM_FOR', ' 9d7a5e56-973c-474c-b6c3-a1cb00833a3c');
46 
  define('UUID_PARTIAL_SYNONYM_FOR', '9d7a5e56-973c-474c-b6c3-a1cb00833a3c');
47 47 
  define('UUID_INVALID_DESIGNATION_FOR', '605b1d01-f2b1-4544-b2e0-6f08def3d6ed');
48 48 
  // (optional)
49 49 
  define('UUID_TAXONOMICALLY_INCLUDED_IN', 'd13fecdf-eb44-4dd7-9244-26679c05df1c');
modules/cdm_dataportal/cdm_dataportal.install
455 455 
    UUID_PROPARTE_SYNONYM_FOR,
456 456 
    UUID_PARTIAL_SYNONYM_FOR
457 457 
  );
458 
  $taxonRelTypes = variable_get(CDM_TAXON_RELATIONSHIP_TYPES);
458 
  $taxonRelTypes = variable_get(CDM_TAXON_RELATIONSHIP_TYPES, unserialize(CDM_TAXON_RELATIONSHIP_TYPES_DEFAULT));
459 459 
  foreach($new_defaults as $default_uuid){
460 460 
    $taxonRelTypes[$default_uuid] = $default_uuid;
461 461 
  }
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