Attachment 123766 Details for Bug 27526 – Bug 27526: Fix incorrect condition

[patch] Bug 27526: Fix incorrect condition

Bug-27526-Fix-incorrect-condition.patch (text/plain), 2.14 KB, created by Martin Renvoize (ashimema) on 2021-08-11 07:56:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-08-11 07:56:04 UTC

Size: 2.14 KB

patch

obsolete

>From a02368c11b64d2643f13fc8d9937e6937a32356f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 20 Jul 2021 11:45:25 +0200
>Subject: [PATCH] Bug 27526: Fix incorrect condition
>
>The barcode was always prefilled!
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> cataloguing/additem.pl | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
>diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
>index aee9c1afaf..47a8190d6c 100755
>--- a/cataloguing/additem.pl
>+++ b/cataloguing/additem.pl
>@@ -457,7 +457,7 @@ if ($op eq "additem") {
>     }
> 
>     # if autoBarcode is set to 'incremental', calculate barcode...
>-    if ( not $item->barcode && C4::Context->preference('autoBarcode') eq 'incremental' ) {
>+    if ( ! defined $item->barcode && C4::Context->preference('autoBarcode') eq 'incremental' ) {
>         my ( $barcode ) = C4::Barcodes::ValueBuilder::incremental::get_barcode;
>         $item->barcode($barcode);
>     }
>@@ -466,7 +466,9 @@ if ($op eq "additem") {
>     if ( $add_submit || $prefillitem) {
> 
>         # check for item barcode # being unique
>-        if ( Koha::Items->search({ barcode => $item->barcode })->count ) {
>+        if ( defined $item->barcode
>+            && Koha::Items->search( { barcode => $item->barcode } )->count )
>+        {
>             # if barcode exists, don't create, but report The problem.
>             push @errors, "barcode_not_unique";
> 
>@@ -713,7 +715,16 @@ if ($op eq "additem") {
>     }
> 
>     # check that the barcode don't exist already
>-    if ( Koha::Items->search({ barcode => $item->barcode, itemnumber => { '!=' => $item->itemnumber } })->count ) {
>+    if (
>+        defined $item->barcode
>+        && Koha::Items->search(
>+            {
>+                barcode    => $item->barcode,
>+                itemnumber => { '!=' => $item->itemnumber }
>+            }
>+        )->count
>+      )
>+    {
>         # FIXME We shouldn't need that, ->store would explode as there is a unique constraint on items.barcode
>         push @errors,"barcode_not_unique";
>         $current_item = $item->unblessed; # Restore edit form for the same item
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27526: 115679 | 115680 | 116006 | 117806 | 117807 | 117808 | 121589 | 121590 | 121591 | 122288 | 122318 | 122655 | 122656 | 122657 | 122658 | 122676 | 122677 | 122681 | 122682 | 122694 | 122695 | 122696 | 122946 | 122947 | 122948 | 122949 | 122950 | 122951 | 122952 | 122953 | 122954 | 122957 | 122958 | 122959 | 122974 | 123006 | 123007 | 123110 | 123329 | 123372 | 123415 | 123757 | 123758 | 123759 | 123760 | 123761 | 123762 | 123763 | 123764 | 123765 | 123766 | 123767 | 123768 | 123769 | 123770 | 123771 | 123772 | 125069 | 125605 | 125606 | 125607 | 125608 | 125609 | 125610 | 125611 | 125612 | 125613 | 125614 | 125615 | 125616 | 125617 | 125618 | 125619 | 125620 | 125818 | 125839 | 125863 | 126034 | 126051 | 126143 | 126144 | 126393 | 127025 | 127032