[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.12-9-gf1c2ed4

[Git repo owner]

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  f1c2ed41491a334c3029f5f2079ea41127263669 (commit)
       via  0db0fe92f00252eed007258034f4a8508c756b3c (commit)
       via  caf97029df8266f9c0ccba090cd75285fafd1224 (commit)
      from  616c113d788af6eaec732ab147710c5b14efd8b3 (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 f1c2ed41491a334c3029f5f2079ea41127263669
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Dec 10 11:17:36 2019 +0100

    Bug 20948: Add missing html filter
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit dc0952200fe22693624722f3b7db15f9022527c1)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit ea2e4bdb866e356295bd68f6a9a0818d5acc7a35)
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>

commit 0db0fe92f00252eed007258034f4a8508c756b3c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Nov 18 10:30:04 2019 +0100

    Bug 20948: Only display item-level hold info if first hold
    
    On the item list of the catalogue detail page we display next item-level
    hold info even if it is not the next hold. That leads to confusion as it
    will not necessarily be the accurate info.
    
    This patch makes the following changes:
    - Display the item-level hold only if it is the next hold (priority ==
    1)
    - Display "There is an item level hold on this item (priority=X)"
    if there is at least 1 item-level hold placed on this item
    
    Test plan:
    - Place several next available holds on a single item record
    - Place an item level hold on the item
    - Go the the biblio detail page
    => Without this patch, the item will show the item level hold
    => With the patch you see "There is an item level hold on this item"
    - Check the item in, confirm the hold
    => No changes, the item will show the waiting hold info
    - Cancel all the holds except the item-level one
    => No changes, the item will how the item-level one
    
    Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 6998a32ca4e29313a02b020d9e36c0c75f129fb1)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit e46289d12c99f3fabf0d00cdd71ec8f921d69be2)
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>

commit caf97029df8266f9c0ccba090cd75285fafd1224
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Nov 18 10:10:56 2019 +0100

    Bug 20948: Simplify existing code
    
    No changes expected here.
    
    Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit bdffc685f2c715b683d3b31e7c218ba71800bf43)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 62021926df99639a4432ce798f4483bbf8edaaba)
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>

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

Summary of changes:
 catalogue/detail.pl                                   |    8 +-------
 .../intranet-tmpl/prog/en/modules/catalogue/detail.tt |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository