Project

General

Profile

Revision 7635cc7d

ID7635cc7d43c9ba203b0c0f59962a56d3df6a777a
Parent 176a8641
Child a0e3ae5c

Added by Andreas Kohlbecker about 4 years ago

ref #6201 fixing problem related to changes in taxon/{uuid}/accepted service

View differences:

modules/cdm_dataportal/cdm_dataportal.module
1736 1736
    $singleTaxon = array_pop($taxon_pager->records);
1737 1737
    if ($singleTaxon->class != "Taxon") {
1738 1738
      // It is a Synonym -> look for the accepted.
1739
      $accepted_taxa = cdm_ws_get(CDM_WS_PORTAL_TAXON_ACCEPTED, array($singleTaxon->uuid), 'classificationFilter=' . get_current_classification_uuid());
1739
      $accepted_taxon = cdm_ws_get(CDM_WS_PORTAL_TAXON_ACCEPTED, array($singleTaxon->uuid), 'classificationFilter=' . get_current_classification_uuid());
1740 1740
      if (!empty($highlite_synonym_uuid)) {
1741
        drupal_goto('cdm_dataportal/taxon/' . $accepted_taxa[0]->uuid . '/synonymy', array('query' => array('highlite' => $highlite_synonym_uuid)));
1741
        drupal_goto('cdm_dataportal/taxon/' . $accepted_taxon->uuid . '/synonymy', array('query' => array('highlite' => $highlite_synonym_uuid)));
1742 1742
      }
1743 1743
      else {
1744
        drupal_goto('cdm_dataportal/taxon/' . $accepted_taxa[0]->uuid . '/synonymy', array('query' => array('highlite' => $singleTaxon->uuid)));
1744
        drupal_goto('cdm_dataportal/taxon/' . $accepted_taxon->uuid . '/synonymy', array('query' => array('highlite' => $singleTaxon->uuid)));
1745 1745
      }
1746 1746
    }
1747 1747
    else {
modules/cdm_dataportal/theme/cdm_dataportal.page.theme
128 128
  // both should have the same footnote key
129 129
  RenderHints::setFootnoteListKey(RenderHints::getRenderPath());
130 130

  
131
  $synomymie = cdm_ws_get(CDM_WS_PORTAL_TAXON_SYNONYMY, $taxon->uuid);
131
  $synomymie = cdm_ws_get(CDM_WS_PORTAL_TAXON_SYNONYMY, array($taxon->uuid));
132 132

  
133 133
  $out = '';
134 134

  
src/test/java/eu/etaxonomy/dataportal/selenium/tests/cichorieae/Lactuca_triquetra_TaxonProfileTest.java
9 9
 */
10 10
package eu.etaxonomy.dataportal.selenium.tests.cichorieae;
11 11

  
12
import static org.junit.Assert.assertEquals;
13
import static org.junit.Assert.assertNotNull;
14
import static org.junit.Assert.assertNull;
15
import static org.junit.Assert.assertTrue;
16

  
17 12
import java.net.MalformedURLException;
18 13
import java.util.List;
19 14
import java.util.UUID;
......
189 184
        assertEquals(blockTextFull, featureBlock.getText());
190 185

  
191 186

  
192
        /* Uses */
187
        /* Credits */
193 188
        featureClass = "credits";
194 189
        featureLabel = "Credits";
195 190
        blockTextFull = featureLabel + "\nChristodoulou C. S. 2009: Images (1 added).\nMakris C. 2009: Images (1 added).";

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)