Project

General

Profile

Revision 64cfdac1

ID64cfdac1799ed42d01f6259293437ff2370aae8d
Parent e7f3789b
Child 281ec7b2

Added by Andreas Kohlbecker 7 months ago

switching portal to real TaxonNodeDTOs

View differences:

modules/cdm_dataportal/cdm_dataportal.module
2664 2664
  $nameStr = trim($nameStr);
2665 2665

  
2666 2666
  if ($nameStr) {
2667
    if(isset($taxonNodeDTO->status_symbol)){
2668
      $nameStr = $taxonNodeDTO->status_symbol . ' ' . $nameStr;
2667
    if(isset($taxonNodeDTO->nodeStatus->symbol)){
2668
      $nameStr = $taxonNodeDTO->nodeStatus->symbol . ' ' . $nameStr;
2669 2669
    }
2670 2670
    // Do not return short names for these.
2671 2671
    if ($taxonNodeDTO->unplaced || $taxonNodeDTO->excluded) {
......
2714 2714

  
2715 2715
  if ($taxon->class == "Taxon" && isset($taxonNodes)) {
2716 2716
    foreach ($taxonNodes as $node) {
2717
      if (isset($node->classification)){
2718
        if(is_object($node->classification)) {
2719
          if ($node->classification->uuid == $defaultTreeUuid) {
2720
            return TRUE;
2721
          }
2717
      if (isset($node->classificationUUID)){
2718
        if ($node->classificationUUID == $defaultTreeUuid) {
2719
          return TRUE;
2722 2720
        }
2723
        else {
2724
          if ($node->classification == $defaultTreeUuid) {
2725
            return TRUE;
2726
          }
2721
      }
2722
      else {
2723
        if ($node->classification == $defaultTreeUuid) {
2724
          return TRUE;
2727 2725
        }
2728 2726
      }
2729 2727
    }

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)