Revision bd814ea2
Added by Andreas Kohlbecker over 5 years ago
| modules/cdm_dataportal/includes/descriptions.inc | ||
|---|---|---|
| 1151 | 1151 |
|
| 1152 | 1152 |
$out = ''; |
| 1153 | 1153 |
|
| 1154 |
$render_array = compose_cdm_specimenOrObservation($element->associatedSpecimenOrObservation);
|
|
| 1154 |
$render_array = compose_cdm_specimen_or_observation($element->associatedSpecimenOrObservation);
|
|
| 1155 | 1155 |
|
| 1156 | 1156 |
if (isset($element->description_L10n)) {
|
| 1157 | 1157 |
$out .= ' ' . $element->description_L10n; |
| modules/cdm_dataportal/includes/occurrences.inc | ||
|---|---|---|
| 234 | 234 |
* |
| 235 | 235 |
* @ingroup compose |
| 236 | 236 |
*/ |
| 237 |
function compose_cdm_specimenOrObservation($specimenOrObservation, &$derivatives = null) {
|
|
| 237 |
function compose_cdm_specimen_or_observation($specimenOrObservation, &$derivatives = null) {
|
|
| 238 | 238 |
|
| 239 | 239 |
$exclude_occurrence_fields = &drupal_static(__FUNCTION__); |
| 240 | 240 |
if (!isset($exclude_occurrence_fields)) {
|
| ... | ... | |
| 511 | 511 |
|
| 512 | 512 |
default: |
| 513 | 513 |
if (is_object($value) || is_array($value)) {
|
| 514 |
drupal_set_message("Unhandled type in compose_cdm_specimenOrObservation() for field " . $field, "warning");
|
|
| 514 |
drupal_set_message("Unhandled type in compose_cdm_specimen_or_observation() for field " . $field, "warning");
|
|
| 515 | 515 |
} else {
|
| 516 | 516 |
_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $value); |
| 517 | 517 |
} |
| ... | ... | |
| 577 | 577 |
); |
| 578 | 578 |
} |
| 579 | 579 |
foreach ($derivedFrom->originals as $original) {
|
| 580 |
compose_cdm_specimenOrObservation($original, $derivatives);
|
|
| 580 |
compose_cdm_specimen_or_observation($original, $derivatives);
|
|
| 581 | 581 |
} |
| 582 | 582 |
} |
| 583 | 583 |
} |
| modules/cdm_dataportal/includes/pages.inc | ||
|---|---|---|
| 187 | 187 |
$specimenOrObservation->uuid, |
| 188 | 188 |
$type_label . $specimenOrObservation->titleCache, |
| 189 | 189 |
$derived_unit_ws_request, |
| 190 |
'cdm_specimenOrObservation',
|
|
| 190 |
'cdm_specimen_or_observation',
|
|
| 191 | 191 |
'Click for details', |
| 192 | 192 |
array('div', 'div'),
|
| 193 | 193 |
array(), |
Also available in: Unified diff
removing cdm_rankVocabulary_as_option() and replacing all usages by the general methdod