@@ -, +, @@ marc_subfields_structure.pl --- admin/marc_subfields_structure.pl | 157 ++++++-------------- .../en/modules/admin/marc_subfields_structure.tt | 75 +++++++++- 2 files changed, 119 insertions(+), 113 deletions(-) --- a/admin/marc_subfields_structure.pl +++ a/admin/marc_subfields_structure.pl @@ -179,29 +179,11 @@ if ( $op eq 'add_form' ) { my %row_data; # get a fresh hash for the row data $row_data{defaultvalue} = $data->{defaultvalue}; $row_data{maxlength} = $data->{maxlength}; - $row_data{tab} = CGI::scrolling_list( - -name => 'tab', - -id => "tab$i", - -values => - [ '-1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ], - -labels => { - '-1' => 'ignore', - '0' => '0', - '1' => '1', - '2' => '2', - '3' => '3', - '4' => '4', - '5' => '5', - '6' => '6', - '7' => '7', - '8' => '8', - '9' => '9', - '10' => 'items (10)', - }, - -default => $data->{'tab'}, - -size => 1, - -multiple => 0, - ); + $row_data{tab} = { + id => "tab$i", + default => $data->{'tab'}, + }; + $row_data{tagsubfield} = $data->{'tagsubfield'} . "{'liblibrarian'} ); $row_data{libopac} = CGI::escapeHTML( $data->{'libopac'} ); $row_data{seealso} = CGI::escapeHTML( $data->{'seealso'} ); - $row_data{kohafield} = CGI::scrolling_list( - -name => "kohafield", - -id => "kohafield$i", - -values => \@kohafields, - -default => "$data->{'kohafield'}", - -size => 1, - -multiple => 0, - ); - $row_data{authorised_value} = CGI::scrolling_list( - -name => "authorised_value", - -id => "authorised_value$i", - -values => \@authorised_values, - -default => $data->{'authorised_value'}, - -size => 1, - -multiple => 0, - ); - $row_data{value_builder} = CGI::scrolling_list( - -name => "value_builder", - -id => "value_builder$i", - -values => \@value_builder, - -default => $data->{'value_builder'}, - -size => 1, - -multiple => 0, - ); - $row_data{authtypes} = CGI::scrolling_list( - -name => "authtypecode", - -id => "authtypecode$i", - -values => \@authtypes, - -default => $data->{'authtypecode'}, - -size => 1, - -multiple => 0, - ); + $row_data{kohafield} = { + id => "kohafield$i", + values => \@kohafields, + default => "$data->{'kohafield'}", + }; + $row_data{authorised_value} = { + id => "authorised_value$i", + values => \@authorised_values, + default => $data->{'authorised_value'}, + }; + $row_data{value_builder} = { + id => "value_builder$i", + values => \@value_builder, + default => $data->{'value_builder'}, + }; + $row_data{authtypes} = { + id => "authtypecode$i", + values => \@authtypes, + default => $data->{'authtypecode'}, + }; $row_data{repeatable} = CGI::checkbox( -name => "repeatable$i", -checked => $data->{'repeatable'} ? 'checked' : '', @@ -278,29 +248,10 @@ if ( $op eq 'add_form' ) { $row_data{'subfieldcode'} = ''; $row_data{'maxlength'} = 9999; - $row_data{tab} = CGI::scrolling_list( - -name => 'tab', - -id => "tab$i", - -values => - [ '-1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ], - -labels => { - '-1' => 'ignore', - '0' => '0', - '1' => '1', - '2' => '2', - '3' => '3', - '4' => '4', - '5' => '5', - '6' => '6', - '7' => '7', - '8' => '8', - '9' => '9', - '10' => 'items (10)', - }, - -default => "", - -size => 1, - -multiple => 0, - ); + $row_data{tab} = { + id => "tab$i", + default => $data->{'tab'}, + }; $row_data{tagsubfield} = "{'tagsubfield'} @@ -308,14 +259,11 @@ if ( $op eq 'add_form' ) { $row_data{liblibrarian} = ""; $row_data{libopac} = ""; $row_data{seealso} = ""; - $row_data{kohafield} = CGI::scrolling_list( - -name => 'kohafield', - -id => "kohafield$i", - -values => \@kohafields, - -default => "", - -size => 1, - -multiple => 0, - ); + $row_data{kohafield} = { + id => "kohafield$i", + values => \@kohafields, + default => "$data->{'kohafield'}", + }; $row_data{hidden} = ""; $row_data{repeatable} = CGI::checkbox( -name => "repeatable$i", @@ -338,28 +286,21 @@ if ( $op eq 'add_form' ) { -value => 1, -label => '' ); - $row_data{value_builder} = CGI::scrolling_list( - -name => "value_builder", - -id => "value_builder$i", - -values => \@value_builder, - -default => $data->{'value_builder'}, - -size => 1, - -multiple => 0, - ); - $row_data{authorised_value} = CGI::scrolling_list( - -name => "authorised_value", - -id => "authorised_value$i", - -values => \@authorised_values, - -size => 1, - -multiple => 0, - ); - $row_data{authtypes} = CGI::scrolling_list( - -name => "authtypecode", - -id => "authtypecode$i", - -values => \@authtypes, - -size => 1, - -multiple => 0, - ); + $row_data{value_builder} = { + id => "value_builder$i", + values => \@value_builder, + default => $data->{'value_builder'}, + }; + $row_data{authorised_value} = { + id => "authorised_value$i", + values => \@authorised_values, + default => $data->{'authorised_value'}, + }; + $row_data{authtypes} = { + id => "authtypecode$i", + values => \@authtypes, + default => $data->{'authtypecode'}, + }; $row_data{link} = CGI::escapeHTML( $data->{'link'} ); $row_data{row} = $i; push( @loop_data, \%row_data ); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -229,7 +229,28 @@ function populateHiddenCheckboxes(tab) {
  • [% loo.repeatable %]
  • [% loo.mandatory %]
  • -
  • [% loo.tab %] (ignore means that the subfield does not display in the record editor)
  • +
  • + + (ignore means that the subfield does not display in the record editor) +
  • @@ -256,7 +277,18 @@ function populateHiddenCheckboxes(tab) {
  • [% loo.isurl %] (if checked, it means that the subfield is a URL and can be clicked)
  • (e.g., Title or Local-Number) NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.
  • -
  • [% loo.kohafield %]
  • +
  • + + +
  • @@ -264,9 +296,42 @@ function populateHiddenCheckboxes(tab) {
      -
    1. [% loo.authorised_value %]
    2. -
    3. [% loo.authtypes %]
    4. -
    5. [% loo.value_builder %]
    6. +
    7. + + +
    8. +
    9. + + +
    10. +
    11. + + +
    --