Revision d68a30b0
Added by Andreas Kohlbecker over 5 years ago
modules/cdm_dataportal/cdm_dataportal.search.php | ||
---|---|---|
777 | 777 |
|
778 | 778 |
function cdm_dataportal_search_registration_form($form, &$form_state) { |
779 | 779 |
|
780 |
static $filter_presets_empty = array( |
|
781 |
'identifier'=> null, |
|
782 |
'taxon_name'=> null, |
|
783 |
'type_designation_status' => null |
|
784 |
); |
|
785 |
|
|
780 | 786 |
_add_font_awesome_font(); |
781 | 787 |
|
782 | 788 |
$filter_presets = (isset($_SESSION['cdm'][SESSION_KEY_SEARCH_REGISTRATION_FILTER]) ? $_SESSION['cdm'][SESSION_KEY_SEARCH_REGISTRATION_FILTER] : array()); |
783 |
$filter_presets = array_merge($filter_presets, remove_drupal_form_params($_REQUEST)); |
|
789 |
$filter_presets = array_merge($filter_presets_empty, $filter_presets, remove_drupal_form_params($_REQUEST));
|
|
784 | 790 |
$form['#action'] = url('/cdm_dataportal/search/registration/'); |
785 | 791 |
$form['#method'] = 'get'; |
786 | 792 |
$form['#attributes'] = array('class' => array('search-filter')); |
modules/cdm_dataportal/includes/pages.inc | ||
---|---|---|
336 | 336 |
$detail_html .= create_label("Citation") . $derivateHierarchy->citation . "<br>"; |
337 | 337 |
} |
338 | 338 |
//assemble specimen details |
339 |
if ($derivateHierarchy->preservedSpecimenDTOs) {
|
|
340 |
foreach ($derivateHierarchy->preservedSpecimenDTOs as $preservedSpecimenDTO) {
|
|
339 |
if ($derivateHierarchy->derivates) {
|
|
340 |
foreach ($derivateHierarchy->derivates as $preservedSpecimenDTO) {
|
|
341 | 341 |
$detail_html .= "<br>"; |
342 | 342 |
$detail_html .= render_cdm_specimen_page($preservedSpecimenDTO); |
343 | 343 |
} |
Also available in: Unified diff
using FielUnitDTO->derivates instead of ->preservedSpecimenDTOs to harmonize with cdmlib