[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.04-150-g5b8ed9c

Git repo owner gitmaster at git.koha-community.org
Fri Apr 26 17:41:16 CEST 2019


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, 18.11.x has been updated
       via  5b8ed9cc0fbb7a9be0963ae10a45b5501d69d95f (commit)
       via  b1290c060253806b9186aba66bdf87fbc66a4ab2 (commit)
       via  6bf436065ebf93cbda4e67c05a238b0e63c22d42 (commit)
       via  05ffb6c6af451aa764f0cb4be1d712d7334f1167 (commit)
       via  61289c5e7806c720c2a2301cb9d9850fd0de94fd (commit)
       via  17b2811d519ed0f4c59bbaafd3194566515cee34 (commit)
      from  461c7176735cbfd4ed7db97a9fa094b60ac2e0ca (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 5b8ed9cc0fbb7a9be0963ae10a45b5501d69d95f
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Apr 25 10:36:36 2019 +0000

    Bug 22339: DBRev 18.11.04.004
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit ed6228de83dc57e624c3b3dc30632775df972277)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit b1290c060253806b9186aba66bdf87fbc66a4ab2
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date:   Thu Mar 14 13:31:34 2019 +0200

    Bug 22339: Fix search field mappings of MARC fixed fields
    
    Fixes handling of /0 selector in addition to several fixed field positions. Note that ff7-01-02 is in fact 00-01 in Zebra and that has been replicated here.
    
    Test plan:
    1. Before applying a patch, check from Elasticsearch (e.g. localhost:9200/koha_biblios/_search?q=_id:123) what is indexed in Elasticsearch for a record for date-entered-on-file, ff7-00, ff7-01, ff7-02 and lleader.
    2. Apply the patch, update database and save the record again.
    3. Verify that the contents of the forementioned fields is now correct in Elasticsearch.
    4. Verify that tests pass:  prove -v t/Koha/SearchEngine/Elasticsearch.t
    
    Signed-off-by: Björn Nylén <bjorn.nylen at ub.lu.se>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 0047ede37e46a3334c9c47d7ebaed848907b6890)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 6bf436065ebf93cbda4e67c05a238b0e63c22d42
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jun 8 12:19:41 2018 -0300

    Bug 20891: Escape html then JSON
    
    To my understanding we need to escape first html chars then to JSON.
    
    If this patch works we will need to rethink the 'To' TT plugin.
    It was originally designed to have several escape methods, but with
    these changes it will not make sense to name it 'To' if used only to
    escape JSON
    
    IIRC we should keep the 2 different ways to use it:
     * [% To.json( string ) %]
     * [% string | $To %]
    otherwise it will be hard to use it when called in argument of
    patron-title.inc (`git grep To.json`)
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit bdf0d85c1de9cbb37cc8a40b0b4a2e86633d3aaf)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 05ffb6c6af451aa764f0cb4be1d712d7334f1167
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jun 7 12:17:26 2018 -0300

    Bug 20891: Escape list's names in JSON
    
    When someone uses \ in the description of a list, the datatable in staff
    won't load and keeps processing.
    
    Test plan:
    - Create a list named "<script>alert('hola');</script>"
    - Create another list named "k\o\h\a"
    - Hit /cgi-bin/koha/virtualshelves/shelves.pl
    
    => Without this patch the lists will not be displayed, JSON is
    malformated
    => With this patch everything is ok
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 2be0195895628ec491ee1f25368e60181c4f1eb2)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 61289c5e7806c720c2a2301cb9d9850fd0de94fd
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Apr 24 15:12:17 2019 +0000

    Bug 22650: Prevent multiple holds on individual items
    
    This patch corrects a missing id on the holds_to_place field and adds code to disable the box when an item is checked
    
    Additionally script login now places a single hold if an itemnumebr is passed and checks for holdability of the specific item
    
    To test:
     1 - Allow multiple holds per record in circ rules
     2 - In staff client, go to place a hold on a record
     3 - Select a patron
     4 - Increase the number of holds
     5 - Then select a specific item to hold
     6 - Patron now has multiple holds on a single item
     7 - Apply patch
     8 - Repeat, notice that count is disabled when item checked
     9 - Confirm count is enabled when 'Hold next available item' is checked
    10 - Set number to more than 1
    11 - Check an item and submit
    12 - Confirm only one item is reserved
    13 - Hit the script directly (with valid info):
         http://localhost:8081/cgi-bin/koha/reserve/placerequest.pl?biblionumber=1&checkitem=1&holds_to_place_count=2&borrowernumber=5
    14 - Confirm only one hold is placed
    15 - Confirm multiple hits of the url do not generate further holds
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit ef5adaff5ac045000b90c4b2b121d8c2ce2d5c59)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 17b2811d519ed0f4c59bbaafd3194566515cee34
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Apr 16 17:21:01 2019 +0000

    Bug 19241: Waiting items show as available in the cart
    
    The cart uses the same item-status.inc that the details page uses, however, we don't
    set the waiting or reserved flags. This patch adds those flags to the script
    
    To test:
    1 - Find an item on the opac
    2 - Place a hold on the item
    3 - Check in the item to confirm the hold
    4 - Note the details page on OPAC shows 'On hold'
    5 - Add the item to a basket
    6 - Note the basket shows 'Available'
    7 - Apply patch
    8 - Check the cart, should show as 'On hold'
    
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit e2fa6d97ef45efb902086aa3a3d232137c054afa)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 Koha.pm                                            |    2 +-
 Koha/SearchEngine/Elasticsearch.pm                 |    6 +--
 Koha/Template/Plugin/To.pm                         |    9 +++-
 admin/searchengine/elasticsearch/mappings.yaml     |   24 ++++-----
 installer/data/mysql/updatedatabase.pl             |   56 ++++++++++++++++++++
 .../prog/en/modules/reserve/request.tt             |    4 +-
 .../virtualshelves/tables/shelves_results.tt       |    4 +-
 opac/opac-basket.pl                                |    3 ++
 reserve/placerequest.pl                            |    9 ++--
 t/Koha/SearchEngine/Elasticsearch.t                |   14 ++++-
 10 files changed, 107 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list