[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-22-g8817812

Thu Aug 2 16:32:19 CEST 2018

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.05.x has been updated
       via  881781240cf0c1a487da1d05732dab300d6e1be7 (commit)
       via  b1a07f712c23e62c830117d4c0ca1390044dc25c (commit)
       via  8191625667162ac240a5d0e4d180632bcf100884 (commit)
       via  5094909140081b02c9688faa07fc630feab91f24 (commit)
       via  c76d5b4b4a531e408fbaa5a9a7a523a749638764 (commit)
       via  517827fb9c2e69d58d8e9345ba2d259de08efded (commit)
       via  f60c611972fe0442ee66f6ebf3a40f00bd11efcc (commit)
       via  512ee5d57617c63da90be09268a77a0317c9e886 (commit)
      from  50f4e8635056d7b664b846db91d48bf282fef949 (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 881781240cf0c1a487da1d05732dab300d6e1be7
Author: David Cook <dcook at prosentient.com.au>
Date:   Fri Jul 20 18:13:49 2018 +1000

    Bug 21097: Missing optgroup closing tag in orderreceive.tt

    There is a missing optgroup closing tag in orderreceive.tt. It doesn't
    actually cause any display issues (at least in modern browsers), but
    it's invalid markup, so this patch fixes it.

    _TEST PLAN_
    0. Add a budget and add a fund
    1. Add a vendor
    2. Add a basket
    3. Add an order to a basket
    4. Close the basket
    5. Receive the order
    6. Make sure the budget and fund both display when selecting the fund

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 12e18f91be2a26501fba502d5f1106d66b06caee)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit b1a07f712c23e62c830117d4c0ca1390044dc25c
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Jul 23 12:23:07 2018 +0000

    Bug 20811: (RM follow-up) fix check for matching

    Notice should only be triggered if both settings are false

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 12b505f2b797d77e800a17830f71a9c054cd076b)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 8191625667162ac240a5d0e4d180632bcf100884
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 20 11:46:58 2018 +0200

    Bug 20811: (QA follow-up) Prevent calling AddItemBatchFromMarc and ModBiblioMarc without biblionumber

    If you use -update but do not find matches (or did not want to match), you
    should not call those routines. We should warn and skip this record.

    Adding a warn at the start that the choice of options may not be smart.
    Note that this needs further attention somewhere else. You could mix
    -update with -insert for instance and still see some problems. (May depend
    on items with unique barcode etc.)

    Test plan:
    Run -update without match or isbn.
    Or run -update -isbn with a non-matching ISBN.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 15b865c6ee558ef278f911ba3693c38c024c7f11)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 5094909140081b02c9688faa07fc630feab91f24
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 20 11:21:11 2018 +0200

    Bug 20811: (QA follow-up) Make the isbn check work

    The following code was never reached, since $isbn was not filled.
        if (!$biblionumber && $isbn_check && $isbn) {
            $sth_isbn->execute($isbn);
            ($biblionumber,$biblioitemnumber) = $sth_isbn->fetchrow;
        }
    Solution: Fix the code with two $isbn declarations. Move the checkisbn
    condition a level deeper.

    Test plan:
    Run misc/migration_tools/bulkmarcimport.pl -file bib726.utf8 --update -isbn
    Since you do not match on biblionumber, the ISBN should match.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

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

commit c76d5b4b4a531e408fbaa5a9a7a523a749638764
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon May 28 15:19:09 2018 -0300

    Bug 20811: Fix wrong usage of ModBiblio

    Since
      commit cefa7c21e28b88351ee8ae0dfefb80a515323df9
      Bug 5635: bulkmarcimport new parameters & features

    AddBiblio call has been replaced with ModBiblio, but the return values
    are different. We should not replace the value of $biblionumber with
    what returns this subroutine.

    Test plan:
    If you are familiar with bulkmarcimport.pl you should know what to test,
    I am not.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

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

commit 517827fb9c2e69d58d8e9345ba2d259de08efded
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jun 21 13:37:35 2018 +0000

    Bug 20974: Remove files left behind after removing Solr

    Some files were left behind when Bug 12538 removed support for Solr.
    This patch removes them.

    To test, apply the patch and fail to observe the existence of these
    files:

    koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
    koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
    koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc

    Perform a search in the OPAC to confirm that nothing broke.

    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>
    (cherry picked from commit ad34ef74cdee0f204c03cdf88b1db775768a44fe)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit f60c611972fe0442ee66f6ebf3a40f00bd11efcc
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Jul 12 10:18:10 2018 +0000

    Bug 21064: Use undefined instead of undef

    To test:
    1 - Load the advanced cataloging editor
    2 - Refresh the page several times
    3 - Check the JS console, you shoudl see an error:
        'undef is not defined'
    4 - Apply patch
    5 - Try again, should be no error

    Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.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 367f47c416fa9164ccb8d9e5f50772e5a516d6b7)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 512ee5d57617c63da90be09268a77a0317c9e886
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jul 11 18:55:06 2018 -0300

    Bug 21053: Encode URI characters in plugin 008

    A # (or &) at any position in 008 field of a bib record causes
    all subsequent data in field to be overwritten with default values when
    record is saved.

    These characters need to be correctly encoded before being passed as
    parameters of the url

    To reproduce:
    1. Find and edit a bib record which has an 008 which differs from the
    default values for the MARC framework
    2. Choose 008 helper
    3. Add # in any position before the end of the field noting the current
    values of the data
    4. Save record
    5. Edit record and select 008 helper
    6. Review characters after #

    Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
    Followed the test plan and it works.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

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

Summary of changes:
 cataloguing/value_builder/marc21_field_008.pl      |    2 +-
 .../prog/en/includes/cateditor-ui.inc              |    2 +-
 .../prog/en/modules/acqui/orderreceive.tt          |    1 +
 .../bootstrap/en/includes/search/facets.inc        |   56 --------------------
 .../bootstrap/en/includes/search/page-numbers.inc  |   18 -------
 .../bootstrap/en/includes/search/resort_form.inc   |   23 --------
 misc/migration_tools/bulkmarcimport.pl             |   13 +++--
 7 files changed, 12 insertions(+), 103 deletions(-)
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc

hooks/post-receive
-- 
main Koha release repository