Bug 29113: Fix random assignation

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
index 9a3932e..de1afef 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
@@ -202,7 +202,7 @@
                 [% UNLESS languages.size %]
                     <li>
                         <label for="title" class="required">Title: </label>
-                        <input id="title" size="100" maxlength="250" type="text" name="title" value="[% additional_content.title | html %]" required="required" class="required" /> <span class="required">Required</span>
+                        <input id="title" size="100" maxlength="250" type="text" name="title_default" value="[% additional_content.title | html %]" required="required" class="required" /> <span class="required">Required</span>
                     </li>
                 [% END %]
                 <li>
@@ -250,11 +250,11 @@
                             <ol>
                                 <li style="list-style: none;">
                                     <label for="title_[% language.lang | html %]">Title: </label>
-                                    <input id="title_[% language.lang| html %]" size="100" maxlength="250" type="text" name="title" value="[% translated_contents.item(language.lang).title | html %]">
+                                    <input id="title_[% language.lang| html %]" size="100" maxlength="250" type="text" name="title_[% language.lang | html %]" value="[% translated_contents.item(language.lang).title | html %]">
                                 </li>
                                 <li style="list-style: none;">
                                     <label for="content_[% language.lang | html %]">Content: </label>
-                                    <textarea name="content" id="content_[% language.lang | html %]" data-lang="[% language.lang | html%]" cols="75" rows="10">[% translated_contents.item(language.lang).content | html %]</textarea>
+                                    <textarea name="content_[% language.lang | html %]" id="content_[% language.lang | html %]" data-lang="[% language.lang | html%]" cols="75" rows="10">[% translated_contents.item(language.lang).content | html %]</textarea>
                                     <input type="hidden" name="lang" value="[% language.lang | html %]" />
                                 </li>
                             </ol>

diff --git a/tools/additional-contents.pl b/tools/additional-contents.pl
index dcbc8d7..e63a44a 100755 (executable)
--- a/tools/additional-contents.pl
+++ b/tools/additional-contents.pl
@@ -83,8 +83,6 @@ elsif ( $op eq 'add_validate' ) {
     my $code       = $cgi->param('code');
     my $branchcode = $cgi->param('branchcode') || undef;
 
-    my @title      = $cgi->multi_param('title');
-    my @content    = $cgi->multi_param('content');
     my @lang       = $cgi->multi_param('lang');
 
     my $expirationdate;
@@ -108,8 +106,8 @@ elsif ( $op eq 'add_validate' ) {
 
     my $success = 1;
     for my $lang ( sort {$a ne 'default'} @lang ) { # Process 'default' first
-        my $title = shift @title;
-        my $content = shift @content;
+        my $title   = $cgi->param( 'title_' . $lang );
+        my $content = $cgi->param( 'content_' . $lang );
         my $additional_content = Koha::AdditionalContents->find(
             {
                 category   => $category,