From 46a30df4a4242d5223f08804e77ac5860ba180da Mon Sep 17 00:00:00 2001 From: remi <remi.mayrand-provencher@inLibro.com> Date: Fri, 31 Jul 2015 08:26:21 -0400 Subject: [PATCH] [SIGNED-OFF] Bug 8643: Removed the use of CGI::checkbox for "Important" subfield and duplicate authorized tag Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- admin/marc_subfields_structure.pl | 15 +-------------- .../prog/en/modules/admin/marc_subfields_structure.tt | 11 ++++++++++- .../prog/en/modules/admin/marctagstructure.tt | 1 - 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index 04d4232..edfe91b 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -196,6 +196,7 @@ if ( $op eq 'add_form' ) { $row_data{liblibrarian} = CGI::escapeHTML( $data->{'liblibrarian'} ); $row_data{libopac} = CGI::escapeHTML( $data->{'libopac'} ); $row_data{seealso} = CGI::escapeHTML( $data->{'seealso'} ); + $row_data{important} = $data->{'important'} ? 1 : 0; $row_data{kohafield} = { id => "kohafield$i", values => \@kohafields, @@ -230,13 +231,6 @@ if ( $op eq 'add_form' ) { -label => '', -id => "mandatory$i" ); - $row_data{important} = CGI::checkbox( - -name => "important$i", - -checked => $data->{'important'} ? 'checked' : '', - -value => 1, - -label => '', - -id => "important$i" - ); $row_data{hidden} = CGI::escapeHTML( $data->{hidden} ); $row_data{isurl} = CGI::checkbox( -name => "isurl$i", @@ -288,13 +282,6 @@ if ( $op eq 'add_form' ) { -value => 1, -label => '' ); - $row_data{important} = CGI::checkbox( - -name => "important$i", - -id => "important$i", - -checked => '', - -value => 1, - -label => '' - ); $row_data{isurl} = CGI::checkbox( -name => "isurl$i", -id => "isurl$i", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index 51463cb..226c09b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -229,7 +229,16 @@ function populateHiddenCheckboxes(tab) { <li><label for="libopac[% loo.row %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac %]" size="40" maxlength="80" /></li> <li><label for="repeatable[% loo.row %]">Repeatable: </label>[% loo.repeatable %]</li> <li><label for="mandatory[% loo.row %]">Mandatory: </label>[% loo.mandatory %]</li> - <li><label for="important[% loo.row %]">Important: </label>[% loo.important %]</li> + <li> + <label for="important[% loo.row %]"> Important: </label> + <label> + [% IF loo.important %] + <input id="important[% loo.row %]" type="checkbox" value="1" name="important[% loo.row %]" checked="checked"/> + [% ELSE %] + <input id="important[% loo.row %]" type="checkbox" value="1" name="important[% loo.row %]"/> + [% END %] + </label> + </li> <li><label for="tab[% loo.row %]">Managed in tab: </label> <select name="tab" tabindex="" size="1" id="[% loo.tab.id %]"> [%- IF ( loo.tab.default == -1 ) -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 1286636..ca3af33 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -111,7 +111,6 @@ $(document).ready(function() { <input type="checkbox" name="important" id="important" value="1" /> [% END %] </li> - <li><label for="authorised_value">Authorized value: </label>[% authorised_value %] (if you select a value here, the indicators will be limited to the authorized value list)</li> </ol></fieldset> <fieldset class="action"> <input type="submit" value="Save changes" /> -- 1.9.1