Bug 12176 - Remove HTML from additem.pl

This patch removes HTML code from additem.pl

To test:
1. Chech no regressions on Add/Edit/Save items
2. Update translation files for a language,
check new string "Tag editor" on staff PO file
3. Check it pass xt/tt_valid.t

Rebased

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 7110f7f..f196ff5 100755 (executable)
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -154,9 +154,6 @@ 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;
@@ -213,29 +210,35 @@ sub generate_subfield_form {
             }
 
             if ($subfieldlib->{'hidden'}) {
-                $subfield_data{marc_value} = qq(<input type="hidden" $attributes /> $authorised_lib{$value});
+                $subfield_data{marc_value} = {
+                    type      => 'hidden',
+                    id        => $subfield_data{id},
+                    maxlength => $subfield_data{max_length},
+                    value     => $value,
+                    avalue    => $authorised_lib{$value},
+                };
             }
             else {
-                $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",
-                );
+                $subfield_data{marc_value} = {
+                    type     => 'select',
+                    id       => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield,
+                    name     => "field_value",
+                    values   => \@authorised_values,
+                    labels   => \%authorised_lib,
+                    default  => $value,
+                };
             }
 
         }
             # it's a thesaurus / authority field
         elsif ( $subfieldlib->{authtypecode} ) {
-                $subfield_data{marc_value} = "<input type=\"text\" $attributes />
-                    <a href=\"#\" class=\"buttonDot\"
-                        onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$subfieldlib->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">...</a>
-            ";
+                $subfield_data{marc_value} = {
+                    type          => 'text1',
+                    id            => $subfield_data{id},
+                    maxlength     => $subfield_data{max_length},
+                    value         => $value,
+                    authtypecode  => $subfieldlib->{authtypecode},
+                };
         }
             # it's a plugin field
         elsif ( $subfieldlib->{value_builder} ) {
@@ -247,22 +250,41 @@ 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} = qq[<input type="text" $attributes
-                        onfocus="Focus$function_name($subfield_data{random}, '$subfield_data{id}');"
-                       onchange=" $change"
-                         onblur=" Blur$function_name($subfield_data{random}, '$subfield_data{id}');" />
-                        <a href="#" class="buttonDot" onclick="Clic$function_name('$subfield_data{id}'); return false;" title="Tag Editor">...</a>
-                        $javascript];
+                    $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,
+                    };
                 } else {
                     warn "Plugin Failed: $plugin";
-                    $subfield_data{marc_value} = "<input type=\"text\" $attributes />"; # supply default input form
+                    $subfield_data{marc_value} = {
+                        type        => 'text',
+                        id          => $subfield_data{id},
+                        maxlength   => $subfield_data{max_length},
+                        value       => $value,
+                    }; # supply default input form
                 }
         }
         elsif ( $tag eq '' ) {       # it's an hidden field
-            $subfield_data{marc_value} = qq(<input type="hidden" $attributes />);
+            $subfield_data{marc_value} = {
+                type        => 'hidden',
+                id          => $subfield_data{id},
+                maxlength   => $subfield_data{max_length},
+                value       => $value,
+            };
         }
         elsif ( $subfieldlib->{'hidden'} ) {   # FIXME: shouldn't input type be "hidden" ?
-            $subfield_data{marc_value} = qq(<input type="text" $attributes />);
+            $subfield_data{marc_value} = {
+                type        => 'text',
+                id          => $subfield_data{id},
+                maxlength   => $subfield_data{max_length},
+                value       => $value,
+            };
         }
         elsif ( length($value) > 100
                     or (C4::Context->preference("marcflavour") eq "UNIMARC" and
@@ -271,10 +293,19 @@ sub generate_subfield_form {
                           500 <= $tag && $tag < 600                     )
                   ) {
             # oversize field (textarea)
-            $subfield_data{marc_value} = "<textarea $attributes_no_value_textarea>$value</textarea>\n";
+            $subfield_data{marc_value} = {
+                type        => 'textarea',
+                id          => $subfield_data{id},
+                value       => $value,
+            };
         } else {
            # it's a standard field
-           $subfield_data{marc_value} = "<input type=\"text\" $attributes />";
+            $subfield_data{marc_value} = {
+                type        => 'text',
+                id          => $subfield_data{id},
+                maxlength   => $subfield_data{max_length},
+                value       => $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 85a4486..1111f14 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -212,7 +212,32 @@ $(document).ready(function() {
                [% ELSE %]
                <label>[% ite.subfield %] - [% ite.marc_lib %]</label>
                [% END %]
-                [% ite.marc_value %]
+
+                [% SET mv = ite.marc_value %]
+                [% IF ( mv.type == 'hidden' ) %]
+                    <input type="hidden" id="[%- mv.id -%]" name="field_value" class="input_marceditor" size="50" maxlength="[%- mv.maxlength -%]" value="[%- mv.value -%]" />[% mv.avalue %]
+                [% ELSIF ( mv.type == 'select' ) %]
+                    <select name="[%- mv.name -%]" id="[%- mv.id -%]" size="1" class="input_marceditor">
+                    [% FOREACH aval IN mv.values %]
+                        [% IF aval == mv.default %]
+                            <option value="[%- aval -%]" selected="selected">[%- mv.labels.$aval -%]</option>
+                        [% ELSE %]
+                            <option value="[%- aval -%]">[%- mv.labels.$aval -%]</option>
+                        [% END %]
+                    [% END %]
+                    </select>
+                [% ELSIF ( mv.type == 'text1' ) %]
+                    <input type="text" id="[%- mv.id -%]" name="field_value" class="input_marceditor" size="50" maxlength="[%- mv.maxlength -%]" value="[%- mv.value -%]" />
+                    <a href="#" class="buttonDot" onclick="Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=&quot;[%- mv.authtypecode -%]&quot;&index=[%- mv.id -%]','[%- mv.id -%]'); return false;" title="Tag editor">...</a>
+                [% ELSIF ( mv.type == 'text2' ) %]
+                    <input type="text" id="[%- mv.id -%]" name="field_value" class="input_marceditor" size="50" maxlength="[%- mv.maxlength -%]" value="[%- mv.value -%]" onfocus="Focus[%- mv.function -%]([%- mv.data_random -%], '[%- mv.id -%]');" onchange="[%- mv.change -%]" onblur="Blur[%- mv.function -%]([%- mv.data_random -%], '[%- mv.id -%]');" />
+                    <a href="#" class="buttonDot" onclick="Clic[%- mv.function -%]('[%- mv.id -%]'); return false;" title="Tag editor">...</a>[% mv.javascript %]
+                [% ELSIF ( mv.type == 'text' ) %]
+                    <input type="text" id="[%- mv.id -%]" name="field_value" class="input_marceditor" size="50" maxlength="[%- mv.maxlength -%]" value="[%- mv.value -%]" />
+                [% ELSIF ( mv.type == 'textarea' ) %]
+                    <textarea id="[%- mv.id -%]" name="field_value" class="input_marceditor" rows="5" cols="64" >[% mv.value %]</textarea>
+                [% END %]
+
                 <input type="hidden" name="tag"       value="[% ite.tag %]" />
                 <input type="hidden" name="subfield"  value="[% ite.subfield %]" />
                 <input type="hidden" name="mandatory" value="[% ite.mandatory %]" />