Bug 16256 - Can't edit library EAN if you leave EAN empty

Test Plan:
1) Create an empty EAN
2) Edit it and save
3) Note you get a new EAN row
4) Apply this patch
5) Edit the empty EAN again
6) Note you now get an updated EAN and not a new row

Signed-off-by: Chris Cormack <chrisc@catalyst.net.z>
Depends on bug 16208 (which depends on 16206)

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>

diff --git a/admin/edi_ean_accounts.pl b/admin/edi_ean_accounts.pl
index ceb7ef5..f65ab9e 100755 (executable)
--- a/admin/edi_ean_accounts.pl
+++ b/admin/edi_ean_accounts.pl
@@ -58,7 +58,7 @@ elsif ( $op eq 'delete_confirm' ) {
 }
 else {
     if ( $op eq 'save' ) {
-        my $change = $input->param('oldean');
+        my $change = $input->param('id');
         if ($change) {
             editsubmit();
         }
@@ -124,19 +124,14 @@ sub addsubmit {
 }
 
 sub editsubmit {
-    $schema->resultset('EdifactEan')->search(
-        {
-            branchcode => $input->param('oldbranchcode'),
-            ean        => $input->param('oldean'),
-        }
-      )->update_all(
+    $schema->resultset('EdifactEan')->find( $input->param('id') )->update(
         {
             branchcode        => $input->param('branchcode'),
             description       => $input->param('description'),
             ean               => $input->param('ean'),
             id_code_qualifier => $input->param('id_code_qualifier'),
         }
-      );
+    );
     return;
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
index 1bbf671..03614ad 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
@@ -52,7 +52,7 @@
   <input type="hidden" name="op" value="save" />
   [% IF ean %]
       <input type="hidden" name="oldbranchcode" value="[% ean.branch.branchcode %]" />
-      <input type="hidden" name="oldean" value="[% ean.ean %]" />
+      <input type="hidden" name="id" value="[% ean.id %]" />
   [% END %]
 
   <fieldset class="rows">
@@ -149,7 +149,7 @@
                  [% END %]
                 </td>
                 <td class="actions">
-                    <a class="btn btn-mini" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&branchcode=[% ean.branch.branchcode %]&ean=[% ean.ean %]"><i class="fa fa-pencil"></i> Edit</a>
+                    <a class="btn btn-mini" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id %]"><i class="fa fa-pencil"></i> Edit</a>
                     <a class="btn btn-mini" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id %]"><i class="fa fa-trash"></i> Delete</a>
                 </td>
             </tr>