[koha-commits] main Koha release repository branch master updated. v20.05.00-1868-g91e21d3a95

Fri Nov 13 14:56:55 CET 2020

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  91e21d3a95520f19fa3632d87f2c8f32b11ea1eb (commit)
       via  7f83e703abd69383cb80ca36cd8219959f1ab205 (commit)
       via  7edb1a55bc54fd5c68700e703be9deff3d6a0199 (commit)
       via  19a30acaece904aeedcc6a3728e3815895d10c56 (commit)
       via  4388d20fb12f77aa733498baa4a287e4fb7c6998 (commit)
       via  14506040292201a78733a9c1746bf7f590205fe3 (commit)
       via  75456ba973f87d3c46d045811ad32dfe2a153e3f (commit)
       via  83d471394562b8137fce9b3a538d19efc41fa1e1 (commit)
       via  b6deb941dc95f8642ef8d20da7f2fcabbc0a15d7 (commit)
       via  e61bcc270e8bc9a13939af60df45a1db53e51530 (commit)
       via  7a42c85889bf779bbcaf82a31793438ebcffc076 (commit)
       via  04a4a34d6e9b7a235ae238b82b991795ca5abb8a (commit)
       via  7b09e86a8d3609e03988be4ad387f018a91d0fd7 (commit)
       via  b6a7a3c8a8fa040409f4c42d10149b72a427cf54 (commit)
       via  7179a29feaf994f35de871d06084f71dfc9eebcc (commit)
       via  5b06c361d6c9a45fb07c853f07fb9aa5d4d77c37 (commit)
       via  780ced27f5ac90d227c88e6fcab2fa43c0b3ffb5 (commit)
       via  db1865ba346704d47be28cf8afdcc6052f55d61a (commit)
      from  dcc1b96ea9cba850b1d5cfb84a171685b1b2a5ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91e21d3a95520f19fa3632d87f2c8f32b11ea1eb
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Nov 13 13:15:29 2020 +0000

    Bug 26988: Adjust for bug 26963

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7f83e703abd69383cb80ca36cd8219959f1ab205
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Nov 13 11:07:53 2020 +0100

    Bug 26988: No need to check if hold is linked to a patron

    Holds are deleted along with patrons.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7edb1a55bc54fd5c68700e703be9deff3d6a0199
Author: Agustin Moyano <agustinmoyano at theke.io>
Date:   Wed Nov 11 12:22:20 2020 -0300

    Bug 26988: (follow-up) Change event to focus

    Click event on select element if Firefox does not work as expected, so
    this patch changes the event to focus for it to work seamlessly in both
    browsers.

    https://bugs.koha-community.org/show_bug.cgi?id=26899
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 19a30acaece904aeedcc6a3728e3815895d10c56
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Nov 11 03:11:56 2020 +0000

    Bug 26988: (follow-up) Fix filter and encode api values and escape rendered values

    This patch makes the QA tools happy and follows correct procedures for passing data to
    and rendering data from the api

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 4388d20fb12f77aa733498baa4a287e4fb7c6998
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Nov 11 02:53:46 2020 +0000

    Bug 26988: (follow-up) Adjust code to use api field names

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 14506040292201a78733a9c1746bf7f590205fe3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Nov 10 17:38:26 2020 -0300

    Bug 26988: (QA follow-up) Make the API return proper library objects

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 75456ba973f87d3c46d045811ad32dfe2a153e3f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Nov 10 17:37:21 2020 -0300

    Bug 26988: Make ->patron prefetchable

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 83d471394562b8137fce9b3a538d19efc41fa1e1
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Nov 10 13:35:14 2020 +0000

    Bug 26988: Add API route to fetch hold pickup locations and use it in the holds table

    To test:
    1 - Place a number of holds on a record
    2 - Have different pickup locations for the holds
    3 - Have some libraries that are not pickup locations
    4 - Load the holds tab for the record and note libraries not pickup locations are not in dropdowns
    5 - Apply patch and restart all things
    6 - Reload the holds table
    7 - Click on a dropdown, note the spinner, should load successfully
    8 - Confirm the dropdown matches the options before the patch
    9 - Confirm updating the hold location works

    Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>

    Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b6deb941dc95f8642ef8d20da7f2fcabbc0a15d7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Nov 13 09:23:51 2020 +0100

    Bug 26963: Ignore existing libraries

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e61bcc270e8bc9a13939af60df45a1db53e51530
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Nov 11 13:26:58 2020 +0000

    Bug 26963: (QA follow-up) Fix up tests and cover case of undefined ccode

    While this technically shouldn't happen, if a library creates itemtype limits, then flips the pref, those rules are still in the db until a ccode rule is saved.

    To be extra safe, when checking for rules of one type, we should make sure the other type is undef - i.e. if looking for ccode rules, we should confirm the itype is undef for those rules

    Additionally, we shouldn't set the barcode now that we are not deleting all items, so we use copynumber for our item identification field as it doesn't need to be unique in the DB

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7a42c85889bf779bbcaf82a31793438ebcffc076
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Nov 11 14:09:24 2020 +0000

    Bug 26963: (QA follow-up) Fix cases where we expected a list

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 04a4a34d6e9b7a235ae238b82b991795ca5abb8a
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Wed Nov 11 15:43:57 2020 +0000

    Bug 26963: (QA follow-up) Update mocked return of pickup_locations

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7b09e86a8d3609e03988be4ad387f018a91d0fd7
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Nov 11 12:49:00 2020 +0000

    Bug 26963: (QA follow-up) Don't delete existing data before tests

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b6a7a3c8a8fa040409f4c42d10149b72a427cf54
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Wed Nov 11 16:06:21 2020 +0000

    Bug 26963: (QA follow-up) Migrate unit tests into pickup_location

    We wrote unit tests for _can_pickup_locations as part of this patchset,
    but then I inlined the method whilst golfing. This patch moves those
    tests into the existing pickup_locations test so we more thoroughly
    cover the case where branch transfer limits are in play.

    NOTE: The tests all assume that all items have an effective_itemtype and
    ccode. I'm pretty sure items all have a type at this point, but I'm less
    sure we enforce collection codes?

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7179a29feaf994f35de871d06084f71dfc9eebcc
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Wed Nov 11 08:57:21 2020 +0000

    Bug 26963: (QA follow-up) Convert to ResultSets

    This patch removes the previously introduced private method by
    converting the arrayref returns to ResultSets appropriately and inlining
    the filter search queries.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 5b06c361d6c9a45fb07c853f07fb9aa5d4d77c37
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Nov 11 02:37:55 2020 +0000

    Bug 26963: (follow-up) Change subroutine name for QA tools

    It didn't like the ending _at

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 780ced27f5ac90d227c88e6fcab2fa43c0b3ffb5
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Nov 9 13:53:51 2020 +0000

    Bug 26963: Don't call 'can_be_transferred' for each possible library for each item

    Currently When calling Koha::Template::Plugin::Branches::pickup_locations
    we call pickup_location for each item of the bib, and for each item we get a list of possible
    branches, we then check those branches against the transfer limits, this is inefficent

    Given a system with 100 branches, and each branch having an item attached to one bib (100 items)
    we will call can_be_transferred ~10000 times - and that will happen for each hold placed on the bib

    For me this patch reduced load time from 77 seconds to 18 seconds

    To test:
    1 - Find a bib
    2 - Place 4 title level holds
    3 - Add some branches and items for this bib to your system:
      INSERT INTO branches (branchcode,branchname,pickup_location) SELECT CONCAT(branchcode,"D"),CONCAT(branchname,"A"),pickup_location FROM branches;
      INSERT INTO branches (branchcode,branchname,pickup_location) SELECT CONCAT(branchcode,"D"),CONCAT(branchname,"B"),pickup_location FROM branches;
      INSERT INTO branches (branchcode,branchname,pickup_location) SELECT CONCAT(branchcode,"D"),CONCAT(branchname,"C"),pickup_location FROM branches;
      INSERT INTO branches (branchcode,branchname,pickup_location) SELECT CONCAT(branchcode,"D"),CONCAT(branchname,"D"),pickup_location FROM branches;
      INSERT INTO items (biblionumber,biblioitemnumber,barcode,itype,homebranch,holdingbranch) SELECT 1,1,CONCAT("test-",branchcode),'BKS',branchcode,branchcode FROM branches;
    4 - Set systempreferences:
        UseBranchTransferLimits = 'enforce'
         BranchTransferLimitsType = 'item type'
    5 - Find the bib and click the holds tab
    6 - Wait for a long time, it shoudl eventually load
    7 - Apply patch and restart al the things
    8 - Load the page again, it should be much faster

    Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
    Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit db1865ba346704d47be28cf8afdcc6052f55d61a
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Nov 11 01:24:15 2020 +0000

    Bug 26963: Unit tests

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

-----------------------------------------------------------------------

Summary of changes:
 Koha/Biblio.pm                                     |   2 +-
 Koha/Hold.pm                                       |  13 ++
 Koha/Item.pm                                       |  61 +++--
 Koha/Library.pm                                    |   2 +-
 Koha/REST/V1/Holds.pm                              |  38 ++++
 Koha/Schema/Result/Reserve.pm                      |   7 +
 Koha/Template/Plugin/Branches.pm                   |   2 +-
 api/v1/swagger/paths.json                          |   3 +
 api/v1/swagger/paths/holds.json                    |  63 ++++++
 .../intranet-tmpl/prog/en/includes/holds_table.inc |   6 +-
 .../prog/en/modules/reserve/request.tt             |   1 +
 koha-tmpl/intranet-tmpl/prog/js/holds.js           |  30 +++
 reserve/request.pl                                 |   2 +-
 t/db_dependent/Koha/{Checkout.t => Hold.t}         |  20 +-
 t/db_dependent/Koha/Item.t                         | 247 ++++++++++++++-------
 t/db_dependent/Template/Plugin/Branches.t          |   3 +-
 16 files changed, 387 insertions(+), 113 deletions(-)
 copy t/db_dependent/Koha/{Checkout.t => Hold.t} (70%)

hooks/post-receive
-- 
main Koha release repository