Project

General

Profile

« Previous | Next » 

Revision c22138fd

Added by Alex Theys almost 12 years ago

AT: committing Palm extension changes for the remote server

View differences:

5.x/modules/cdm_dataportal/cdm_api/cdm_api.module
337 337
  $i = 0;
338 338
  while(strpos($uri_pattern, "$".$i) !== FALSE){
339 339
    if(count($pathParameters) <= $i){
340
      if(drupal_check_module("user") && user_access('administer')){
340
      //if(drupal_check_module("user") && user_access('administer')){
341
    	if(true){
341 342
        drupal_set_message('cdm_compose_url(): missing pathParameters', 'debug');
342 343
      }
343 344
      break;
5.x/modules/cdm_dataportal/cdm_api/webservice_uris.php
14 14

  
15 15
define('CDM_WS_PORTAL_TAXON_NAMETYPEDESIGNATIONS', 'portal/taxon/$0/nameTypeDesignations');
16 16

  
17
define('CDM_WS_PORTAL_TAXON_DESCRIPTIONS', 'portal/taxon/$0/descriptions');
17
define('CDM_WS_PORTAL_TAXON_DESCRIPTIONS', 'portal/taxon/$0/descriptions/$1');
18 18
define('CDM_WS_PORTAL_TAXON_USEDESCRIPTIONS', 'portal/taxon/$0/useDescriptions');
19 19

  
20 20
/**
5.x/modules/cdm_dataportal/theme/cdm_dataportal.descriptions.theme
639 639
  RenderHints::pushToRenderStack('descriptionElementDistribution');
640 640
  RenderHints::setFootnoteListKey(UUID_DISTRIBUTION);
641 641
  //getting all the taxon description for a given taxon
642
  $taxonDescriptions = cdm_ws_get(CDM_WS_PORTAL_TAXON_DESCRIPTIONS, $taxon_uuid);
642
  $taxonDescriptions = cdm_ws_get(CDM_WS_PORTAL_TAXON_DESCRIPTIONS, array($taxon_uuid, 'test'));
643 643
  foreach ($taxonDescriptions as $description){
644 644
    $descriptions_uuids[] = $description->uuid;
645 645
  }
5.x/modules/cdm_dataportal/theme/cdm_dataportal.page.theme
121 121
  if($page_part == 'description' || $page_part == 'all'){
122 122

  
123 123
    $featureTree = cdm_ws_get(CDM_WS_FEATURETREE, variable_get(CDM_DATAPORTAL_DEFAULT_FEATURETREE_UUID, UUID_DEFAULT_FEATURETREE));
124
    $taxonDescriptions = cdm_ws_get(CDM_WS_PORTAL_TAXON_DESCRIPTIONS, $taxon->uuid); //retrieve all description for the taxon
124
    $taxonDescriptions = cdm_ws_get(CDM_WS_PORTAL_TAXON_DESCRIPTIONS, array($taxon->uuid, 'test')); //retrieve all description for the taxon
125 125

  
126 126
    $nonStructuredDescriptions = array();
127 127
    if($taxonDescriptions != null){

Also available in: Unified diff