[koha-commits] main Koha release repository branch 19.11.x updated. v19.11.05-193-g2cb01116ee

Wed May 13 18:43:14 CEST 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, 19.11.x has been updated
       via  2cb01116ee3ed6ce6296cb0ad5e794fd68e58f8a (commit)
       via  08aa52c8315c7bec6df9800101c61591892d07dd (commit)
       via  c748b95d57ef625e77742785f8ced5369b326787 (commit)
       via  5518f9183054a49c672c94c6d98081da41571668 (commit)
       via  1bae59611da3ed166176fc67f5e68980afbb87d0 (commit)
       via  b56c9376f1f6abda4147c183bada7c999c592985 (commit)
       via  a833492869b8e53d2e2b24f1c7aead6fb62765fa (commit)
       via  27476256dfa391693b4d7473b40b95fe73cf8291 (commit)
      from  854c71df7914b1539e9c3af8b65096d607ea5595 (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 2cb01116ee3ed6ce6296cb0ad5e794fd68e58f8a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri May 8 06:46:59 2020 +0000

    Bug 22437: (follow-up) Move deletion of merge requests to DelAuthority

    Lines can be moved. Deletion can be done too if skip_merge is not set.

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

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit 08aa52c8315c7bec6df9800101c61591892d07dd
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Apr 3 08:55:45 2020 +0000

    Bug 22437: Delete older merge requests at new merge time

    If you merge A to B, we should remove older AA merges (regular
    merge to itself) in the queue before deleting A.

    Test plan:
    [1] Set merge limit in prefs to say X.
    [2] Find three authorities A, B, C with linkcount >X, >X, <X.
    [3] Merge C to B. This creates a 'BB merge' in the queue.
        Auth C is deleted.
    [4] Merge B to A. Creating AA and BA in the queue.
        Auth B is deleted.
        Optionally verify that BB is no longer in the queue.
    [5] Run the merge_authorities.pl cron job.
        Verify that the linkcount to A is the former total of ABC.

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

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit c748b95d57ef625e77742785f8ced5369b326787
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Apr 6 13:44:46 2020 +0000

    Bug 22437: Add test case to Merge.t

    Test proves now that a 'destructive merge' is removed by
    DelAuthority.

    Test plan:
    Run t/db_dependent/Authority/Merge.t. Should fail when you
    do not apply the other two patches and pass with them.

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

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit 5518f9183054a49c672c94c6d98081da41571668
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu May 7 13:08:14 2020 +0000

    Bug 25342: Unit test

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit 1bae59611da3ed166176fc67f5e68980afbb87d0
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri May 1 14:48:55 2020 +0000

    Bug 25342: Force ES id as string

    To test:
    1 - Be using ES
    2 - Find a unique record by searchign for title or seomthing
    3 - Edit the record
    4 - Repeat search and confirm you are returned to the details page
    5 - Go to Tools->MARC modification templates
    6 - Add a template and define an action
    7 - Go to Tools->Batch record modification
    8 - Select Enter a list of record numbers
    9 - Enter the biblionumber of the record you searched for
    10 - Use the marc modification template you setup
    11 - Complete the modification
    12 - Repeat your search
    13 - note you get two results, both pointing to same biblionumber
    14 - Check the ES index, note that you have two entries, one with the biblionumber, and the other with #.0, e.g.:
        curl -XGET 'es:9200/koha_kohadev_biblios/data/14.0?pretty'
        curl -XGET 'es:9200/koha_kohadev_biblios/data/14?pretty'
    15 - Apply patch
    16 - Delete and rebuild ES index
        perl misc/search_tools/rebuild_elasticsearch.pl -d -b
    17 - Repeat 2-12
    18 - No duplication this time

    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit b56c9376f1f6abda4147c183bada7c999c592985
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon May 11 11:10:20 2020 +0200

    Bug 25301: Removed URI parameter "categorycode" from the toolbar

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit a833492869b8e53d2e2b24f1c7aead6fb62765fa
Author: Petro Vashchuk <stalkernoid at gmail.com>
Date:   Thu May 7 12:22:24 2020 +0300

    Bug 25301: removed URI parameter "categorycode" from "circulation.tt"

    "Edit details" links in patron's circulation check-out page
    was sending empty query parameter "categorycode" because there is no
    defined template parameter in "circulation.pl"

    This patch removes the URI parameter from "circulation.tt" template.

    To test:
        1) You need to create or find expired or expiring patron.
        2) Head to patron's circulation check-out page.
        3) Inspect "Edit details" link.
        4) Observe empty parameter "categorycode=" in that link.
        5) Apply patch.
        6) Repeat step 3.
        7) Check that there's no "categorycode=" in the link anymore.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

commit 27476256dfa391693b4d7473b40b95fe73cf8291
Author: Petro Vashchuk <stalkernoid at gmail.com>
Date:   Wed May 6 16:09:01 2020 +0300

    Bug 25301: removed useless URI parameter "categorycode" from template

    Both "Edit details" links were sending empty query parameter
    "categorycode" as there is no such template parameter in "moremember.pl"
    defined at all, because template code block looks copy-pasted
    from "circulation.tt".

    This patch removes the parameter from "moremember.tt" template.

    To test:
        1) You need to create or find expired or expiring patron.
        2) Head to patron details page of that patron.
        3) Inspect both "Edit details" links:
           one in the notification about expiration
           and other one in the "Expiration date:" field.
        4) Observe empty parameter "categorycode=" in those links.
        5) Apply patch.
        6) Repeat step 3.
        7) Check that there's no "categorycode=" in the links anymore.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>

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

Summary of changes:
 C4/AuthoritiesMarc.pm                              |  7 +++++-
 Koha/SearchEngine/Elasticsearch/Indexer.pm         |  3 +--
 authorities/merge.pl                               |  4 ++--
 .../prog/en/includes/members-toolbar.inc           |  4 ++--
 .../prog/en/modules/circ/circulation.tt            |  4 ++--
 .../prog/en/modules/members/moremember.tt          |  8 +++----
 t/db_dependent/Authority/Merge.t                   | 15 +++++++++++-
 .../Koha/SearchEngine/Elasticsearch/Indexer.t      | 28 +++++++++++++++++++++-
 8 files changed, 58 insertions(+), 15 deletions(-)

hooks/post-receive
-- 
main Koha release repository