Commit 3a2121d1 authored by Russell Blakeborough's avatar Russell Blakeborough
Browse files

Issue #1483672 by russellb: default block vocabularies to analysis vocabularies

parent 388750c1

taxonomy_nco.module

+6 −3
Changes for taxonomy_nco.module: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -252,7 +252,9 @@ function taxonomy_nco_block_view($delta, $edit = array()) { 
  switch ($delta) {

    case 'taxonomy-nco':

      $multi_id = isset($edit['multiblock_delta']) ? '_'. $edit['multiblock_delta']['#value'] : '';

      $chosenvocs = explode(',',variable_get('taxonomy_nco_block'.$multi_id.'_vocabularies', TAXONOMY_NCO_VOCABULARY));

      // get analysis vocabularies to provide as default for block vocab selection

      $analysis_vocabularies = variable_get('taxonomy_nco_analysis_vocabulary', TAXONOMY_NCO_VOCABULARY);

      $chosenvocs = explode(',',variable_get('taxonomy_nco_block'.$multi_id.'_vocabularies', $analysis_vocabularies));

      $block['subject'] = t('Related Subjects');

      $block['content'] = taxonomy_nco_relationship_block_contents($chosenvocs);

      break;
@@ -267,8 +269,9 @@ function taxonomy_nco_block_configure($delta, $edit = array()) { 
  $form = array();

  if ($delta == 'taxonomy-nco') {

    $multi_id = isset($edit['multiblock_delta']) ? '_'. $edit['multiblock_delta']['#value'] : '';

    $availablevocabularies = explode(',',variable_get('taxonomy_nco_analysis_vocabulary', TAXONOMY_NCO_VOCABULARY));

    $chosenvocs = explode(',',variable_get('taxonomy_nco_block'.$multi_id.'_vocabularies', TAXONOMY_NCO_VOCABULARY));

    $analysis_vocabularies = variable_get('taxonomy_nco_analysis_vocabulary', TAXONOMY_NCO_VOCABULARY);

    $availablevocabularies = explode(',',$analysis_vocabularies);

    $chosenvocs = explode(',',variable_get('taxonomy_nco_block'.$multi_id.'_vocabularies', $analysis_vocabularies));

    $form['taxonomy_vocabularies'] =  array(

      '#type' => 'select',

      '#multiple' => TRUE,