Project

General

Profile

« Previous | Next » 

Revision f0bf24e7

Added by Andreas Kohlbecker almost 11 years ago

avoiding unnesecary reference/{uuid}/authorTeam calls

View differences:

7.x/modules/cdm_dataportal/cdm_dataportal.module
1246 1246
    $singleTaxon = array_pop($taxon_pager->records);
1247 1247
    if ($singleTaxon->class != "Taxon") {
1248 1248
      // It is a Synonym -> look for the accepted.
1249
      $taxon = cdm_ws_get(CDM_WS_PORTAL_TAXON_ACCEPTED, array($singleTaxon->uuid, get_taxonomictree_uuid_selected()));
1249
      $accepted_taxa = cdm_ws_get(CDM_WS_PORTAL_TAXON_ACCEPTED, array($singleTaxon->uuid, get_taxonomictree_uuid_selected()));
1250 1250
      if (!empty($highlite_synonym_uuid)) {
1251
        drupal_goto('cdm_dataportal/taxon/' . $taxon[0]->uuid . '/synonymy', array('query' => array('highlite' => $highlite_synonym_uuid)));
1251
        drupal_goto('cdm_dataportal/taxon/' . $accepted_taxa[0]->uuid . '/synonymy', array('query' => array('highlite' => $highlite_synonym_uuid)));
1252 1252
      }
1253 1253
      else {
1254
        drupal_goto('cdm_dataportal/taxon/' . $taxon[0]->uuid . '/synonymy', array('query' => array('highlite' => $singleTaxon->uuid)));
1254
        drupal_goto('cdm_dataportal/taxon/' . $accepted_taxa[0]->uuid . '/synonymy', array('query' => array('highlite' => $singleTaxon->uuid)));
1255 1255
      }
1256 1256
    }
1257 1257
    else {
7.x/modules/cdm_dataportal/theme/cdm_dataportal.bibliography.theme
388 388

  
389 389
      default:
390 390
        /*
391
        $author_team = cdm_ws_get(CDM_WS_REFERENCE_AUTHORTEAM, $reference->citation->uuid);
391
        $author_team = cdm_ws_get(CDM_WS_REFERENCE  _AUTHORTEAM, $reference->citation->uuid);
392 392

  
393 393
        if(!empty($author_team->titleCache)) {
394 394
          $referenceString.= print_r($reference->citation);
7.x/modules/cdm_dataportal/theme/cdm_dataportal.references.theme
71 71
  $doLink = $variables['doLink'];
72 72
  $referenceStyle = $variables['referenceStyle'];
73 73

  
74
  $author_team = cdm_ws_get(CDM_WS_REFERENCE_AUTHORTEAM, $reference->uuid);
74
  if(!isset($reference->authorTeam)){
75
    $author_team = cdm_ws_get(CDM_WS_REFERENCE_AUTHORTEAM, $reference->uuid);
76
  } else {
77
    $author_team = $reference->authorTeam;
78
  }
75 79

  
76 80
  if ($referenceStyle == "zoology") {
77 81
    $year = '';
7.x/modules/cdm_dataportal/theme/cdm_dataportal.taxon.theme
281 281
        // TODO avoid using Ajax in the cdm_dynabox .... why?
282 282
        // TODO add media.
283 283
        $out .= cdm_dynabox(
284
            $taxon->uuid,
285
            // taxon name as label
284
            $taxon->uuid,// dynabox uuid
285
            // taxon name as label:
286 286
            theme('cdm_taxonName', array(
287 287
              'taxonName' => $taxon->name,
288 288
              'nameLink' => NULL,
289 289
              'refenceLink' => NULL,
290 290
              'show_annotations' => FALSE,
291 291
            )),
292
            cdm_compose_url(CDM_WS_PORTAL_TAXON_ACCEPTED, array(
293
            $taxon->uuid,
294
            $classification_uuid,
295
            )), 'cdm_list_of_taxa', 'Click for accepted taxon');
292
            // content_url:
293
            cdm_compose_url(CDM_WS_PORTAL_TAXON_ACCEPTED,
294
                array(
295
                    $taxon->uuid,
296
                    $classification_uuid
297
                )
298
            ),
299
            // theme to use for rendering:
300
            'cdm_list_of_taxa',
301
            // label to toggle open:
302
            'Click for accepted taxon'
303
         );
296 304
      }
297 305
    }
298 306
    else {

Also available in: Unified diff