[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.08-24-g0865b08

[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, 17.11.x has been updated
       via  0865b082d2e2f37722fdd06dfca052f5a7866faf (commit)
       via  ceb93b2da01f8f8447a428d8d8b2be671bcbc3d5 (commit)
       via  3fdf85ad92376e7f3f766ae4ce8d568ecdfb450c (commit)
       via  30871b42b620621cb131dfac99ad600f32428752 (commit)
      from  3f75695c7ac15da3c32622aaef02e696e3a7455a (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 0865b082d2e2f37722fdd06dfca052f5a7866faf
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri May 25 09:32:58 2018 +0000

    Bug 18822: Check if we have MARC::Record and convert if not when using ES
    
    The new_record_from_zebra subroutine assumes that when using ES we
    always get MARC::Record objects when using ES, but sometimes we get them as xml via Z39 or
    internally. This adds a test to new_from_zebra to confirm we have a
    record object and to convert it if not
    
    To test:
    1 - Perform an advanced search from the advanced editor, make sure to
    select 'Local catalog' and a remote source
    2 - Error 'Internal search error [Object object]'
    3 - Apply patch
    4 - Repeat search, success!
    5 - Select and deselect various servers, search should still work
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 49db39c060163c3d46de4eff283919cc9af30a97)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ceb93b2da01f8f8447a428d8d8b2be671bcbc3d5
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Jun 19 11:21:41 2017 -0400

    Bug 18822: Better error response
    
    Apply this patch first to see a change in the error feedback - instead
    of [Object object] you should get a text readable error
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 9e26419e30c88d8a9cd54660752fda89170ae3f8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 3fdf85ad92376e7f3f766ae4ce8d568ecdfb450c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 2 10:41:24 2018 +0200

    Bug 20900: Add CPL branch in t_Batch.t too
    
    Same fix as previous patch.
    
    Test plan:
    Run t/db_dependent/Labels/t_Batch.t (without CPL branch)
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 1ad0724b804970fe9ca8e8333b1fb0b893c28cf4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 30871b42b620621cb131dfac99ad600f32428752
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jun 8 10:56:10 2018 +0200

    Bug 20900: Add CPL test branch in rollingloans.t
    
    Trivial fix.
    
    Test plan:
    Without this patch and a CPL library, run rollingsloans.t. See warns.
    With this patch, no warns.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 7e3f399867abdf506ff271c57d652d1b3cdf8a7e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Search.pm                                              |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc |    2 +-
 t/db_dependent/Labels/t_Batch.t                           |   10 +++++++++-
 t/db_dependent/rollingloans.t                             |    6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository