From 4705242ef8100cc9d747635c1f6d9efc2eb948ec Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 27 Aug 2014 08:24:44 -0300 Subject: [PATCH] Revert "Bug 12176 - Remove HTML from additem.pl" This reverts commit 0033d287bad3344fad0861134d8dd3e03e56ed24. I made a mistake pushing this one before the UTF-8 work. Signed-off-by: George Williams http://bugs.koha-community.org/show_bug.cgi?id=12765 --- cataloguing/additem.pl | 91 +++++++------------- .../prog/en/modules/cataloguing/additem.tt | 27 +----- 2 files changed, 31 insertions(+), 87 deletions(-) diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index f196ff5..7110f7f 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -154,6 +154,9 @@ sub generate_subfield_form { my $input = new CGI; $value = $input->param('barcode'); } + my $attributes_no_value = qq(id="$subfield_data{id}" name="field_value" class="input_marceditor" size="50" maxlength="$subfield_data{maxlength}" ); + my $attributes_no_value_textarea = qq(id="$subfield_data{id}" name="field_value" class="input_marceditor" rows="5" cols="64" ); + my $attributes = qq($attributes_no_value value="$value" ); if ( $subfieldlib->{authorised_value} ) { my @authorised_values; @@ -210,35 +213,29 @@ sub generate_subfield_form { } if ($subfieldlib->{'hidden'}) { - $subfield_data{marc_value} = { - type => 'hidden', - id => $subfield_data{id}, - maxlength => $subfield_data{max_length}, - value => $value, - avalue => $authorised_lib{$value}, - }; + $subfield_data{marc_value} = qq( $authorised_lib{$value}); } else { - $subfield_data{marc_value} = { - type => 'select', - id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield, - name => "field_value", - values => \@authorised_values, - labels => \%authorised_lib, - default => $value, - }; + $subfield_data{marc_value} =CGI::scrolling_list( # FIXME: factor out scrolling_list + -name => "field_value", + -values => \@authorised_values, + -default => $value, + -labels => \%authorised_lib, + -override => 1, + -size => 1, + -multiple => 0, + -id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield, + -class => "input_marceditor", + ); } } # it's a thesaurus / authority field elsif ( $subfieldlib->{authtypecode} ) { - $subfield_data{marc_value} = { - type => 'text1', - id => $subfield_data{id}, - maxlength => $subfield_data{max_length}, - value => $value, - authtypecode => $subfieldlib->{authtypecode}, - }; + $subfield_data{marc_value} = " + {authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">... + "; } # it's a plugin field elsif ( $subfieldlib->{value_builder} ) { @@ -250,41 +247,22 @@ sub generate_subfield_form { my $change = index($javascript, 'function Change') > -1 ? "return Change$function_name($subfield_data{random}, '$subfield_data{id}');" : 'return 1;'; - $subfield_data{marc_value} = { - type => 'text2', - id => $subfield_data{id}, - maxlength => $subfield_data{max_length}, - value => $value, - function => $function_name, - data_random => $subfield_data{random}, - change => $change, - javascript => $javascript, - }; + $subfield_data{marc_value} = qq[ + ... + $javascript]; } else { warn "Plugin Failed: $plugin"; - $subfield_data{marc_value} = { - type => 'text', - id => $subfield_data{id}, - maxlength => $subfield_data{max_length}, - value => $value, - }; # supply default input form + $subfield_data{marc_value} = ""; # supply default input form } } elsif ( $tag eq '' ) { # it's an hidden field - $subfield_data{marc_value} = { - type => 'hidden', - id => $subfield_data{id}, - maxlength => $subfield_data{max_length}, - value => $value, - }; + $subfield_data{marc_value} = qq(); } elsif ( $subfieldlib->{'hidden'} ) { # FIXME: shouldn't input type be "hidden" ? - $subfield_data{marc_value} = { - type => 'text', - id => $subfield_data{id}, - maxlength => $subfield_data{max_length}, - value => $value, - }; + $subfield_data{marc_value} = qq(); } elsif ( length($value) > 100 or (C4::Context->preference("marcflavour") eq "UNIMARC" and @@ -293,19 +271,10 @@ sub generate_subfield_form { 500 <= $tag && $tag < 600 ) ) { # oversize field (textarea) - $subfield_data{marc_value} = { - type => 'textarea', - id => $subfield_data{id}, - value => $value, - }; + $subfield_data{marc_value} = "\n"; } else { # it's a standard field - $subfield_data{marc_value} = { - type => 'text', - id => $subfield_data{id}, - maxlength => $subfield_data{max_length}, - value => $value, - }; + $subfield_data{marc_value} = ""; } return \%subfield_data; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 1111f14..85a4486 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -212,32 +212,7 @@ $(document).ready(function() { [% ELSE %] [% END %] - - [% SET mv = ite.marc_value %] - [% IF ( mv.type == 'hidden' ) %] - [% mv.avalue %] - [% ELSIF ( mv.type == 'select' ) %] - - [% ELSIF ( mv.type == 'text1' ) %] - - ... - [% ELSIF ( mv.type == 'text2' ) %] - - ...[% mv.javascript %] - [% ELSIF ( mv.type == 'text' ) %] - - [% ELSIF ( mv.type == 'textarea' ) %] - - [% END %] - + [% ite.marc_value %] -- 1.7.10.4