Project

General

Profile

« Previous | Next » 

Revision b011743c

Added by Andreas Kohlbecker about 5 years ago

ref #8166 adapting to change in FeatureNode property 'feature' becomes 'term'

View differences:

modules/cdm_dataportal/settings.php
2206 2206

  
2207 2207
    // creating helper object to retrieve the default settings
2208 2208
    $featureNode = new stdClass();
2209
    $featureNode->feature = new stdClass();
2210
    $featureNode->feature->uuid="DEFAULT";
2211
    $featureNode->feature->representation_L10n = "Default";
2209
    $featureNode->term = new stdClass();
2210
    $featureNode->term->uuid="DEFAULT";
2211
    $featureNode->term->representation_L10n = "Default";
2212 2212
    array_unshift($profile_feature_tree->root->childNodes, $featureNode);
2213 2213

  
2214 2214
    foreach ($profile_feature_tree->root->childNodes as $featureNode) {
2215 2215

  
2216
      if (!$feature_list_layout_settings_disabled && isset($featureNode->feature)) {
2216
      if (!$feature_list_layout_settings_disabled && isset($featureNode->term)) {
2217 2217

  
2218 2218
        // $subform_id must not exceed 45 characters, a uuid has 36 characters
2219
        $subform_id = $featureNode->feature->uuid;
2220
        $feature_block_setting = get_feature_block_settings($featureNode->feature->uuid);
2219
        $subform_id = $featureNode->term->uuid;
2220
        $feature_block_setting = get_feature_block_settings($featureNode->term->uuid);
2221 2221

  
2222 2222
//        $settings = mixed_variable_get($subform_id, FEATURE_TREE_LAYOUT_DEFAULTS);
2223 2223

  
2224 2224
        $form_feature_block_layout[$subform_id] = array(
2225 2225
          '#type' => 'fieldset',
2226 2226
          '#tree' => TRUE,
2227
          '#title' => $featureNode->feature->representation_L10n,
2227
          '#title' => $featureNode->term->representation_L10n,
2228 2228
          '#collapsible' => FALSE,
2229 2229
          '#collapsed' => FALSE,
2230 2230
        );
2231
        if($featureNode->feature->uuid == "DEFAULT"){
2231
        if($featureNode->term->uuid == "DEFAULT"){
2232 2232
          $form_feature_block_layout[$subform_id]['#description']='These are the defaults which apply to
2233 2233
          all feature blocks for which no specific settings have been defined. for consistency enabling links for <em>source
2234 2234
          references</em> and <em>names in source</em> is only possible in the defaults';
......
2246 2246
          ),
2247 2247
        );
2248 2248

  
2249
        if($featureNode->feature->uuid == "DEFAULT"){
2249
        if($featureNode->term->uuid == "DEFAULT"){
2250 2250
          $form_feature_block_layout[$subform_id]['link_to_reference'] = array(
2251 2251
            '#type' => 'checkbox',
2252 2252
            '#title' => t('Link to reference'),

Also available in: Unified diff