[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.03-61-g083b20d

Sun Feb 19 22:31:20 CET 2017

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, 16.11.x has been updated
       via  083b20d34ac87e215e20948a0a7d4fe862a872d6 (commit)
       via  d204482b5e801e47bb516ece52f0596cc14c2aea (commit)
       via  44e4772c428300c45bd477a0fe8cde7d33167a3e (commit)
       via  37fd4f0becc0f5884983dd1f64bd53a71005c166 (commit)
       via  41335270815dd88f9678531befef4ee8126baaa1 (commit)
       via  d4bf99e488740201832743bf9e8f5b0e4915902c (commit)
       via  34eff6378614572735d768824695b104564ce76f (commit)
       via  7ee00feb7098c6413ae372fda5c03a14ccfbbe2c (commit)
       via  c9ee7be2548bd47dbfe8dc4efb39b60869c36518 (commit)
       via  6c8aa636cc13e970aa2a3b3b18dc87292ea60ab8 (commit)
       via  7c4463513433a65ccc8ea0c53a8124f727377a6c (commit)
       via  7736967c6942c6e5a9cbaf0c4e307485f02704b6 (commit)
       via  7894a34479b1b3a120938687fbd856be9f756bfc (commit)
       via  e2b22a3195ba0ddf8a80b3ea3bf77f1d9af456fc (commit)
      from  2cd32363301431b8f9886eb0e60a8ad5160e339a (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 083b20d34ac87e215e20948a0a7d4fe862a872d6
Author: root <root at master.rijkskoha.nl>
Date:   Thu Feb 16 15:00:29 2017 +0100

    Bug 17913: [16.11.x] Add syspref to sysprefs.sql

    See comment 69.

commit d204482b5e801e47bb516ece52f0596cc14c2aea
Author: Magnus Enger <magnus at libriotech.no>
Date:   Tue Oct 18 09:47:19 2016 +0000

    Bug 17461: Warn about plugins that can't be loaded

    The logs should have some info if a module has been installed that can
    not be loaded.

    To test:
    - Make sure you have an up to date dev install
    - Install v1.0 of the KitchenSink plugin from
      https://github.com/bywatersolutions/koha-plugin-kitchen-sink/releases
    - Make sure the plugin does not show up in the list of installed
      plugins, and that the intranet-error.log has no info about it
    - Apply the patch
    - Reload plugins-home.pl
    - Verify that there is now some interesting info in intranet-error.log

    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    Works as advertised, generates useful diagnostic information in the form of a log entry to either intranet-error or plack-error.log. Relief, thanks Magnus!
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 830786aba7084698c081a3f7745fe0fe54643c18)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 44e4772c428300c45bd477a0fe8cde7d33167a3e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jan 23 11:40:48 2017 +0100

    Bug 17950: Merge.t: Improve variable handling at top level

    This patch does:
    [1] Remove unused $dbh.
    [2] Move all mocking statements to one sub.
    [3] Promote a few lexicals to globals when used in the subtests.

    Test plan:
    Run t/db_dependent/Authorities/Merge.t

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

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 849877d8d3bcd3791c624a84ec5e4cb0550fa0fe)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 37fd4f0becc0f5884983dd1f64bd53a71005c166
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jan 23 10:44:57 2017 +0100

    Bug 17950: Improve quick UNIMARC fix in Merge.t

    Bug 17909 and 17913 added a quick fix for Merge.t on UNIMARC records.
    This patch improves that fix with the sub compare_fields, a merge from
    compare_field_count and compare_field_order.
    Also it adds the option to test MARC21/UNIMARC by adding a command line
    switch that triggers mocking the marcflavour preference.
    The test on a cleared field 609 in strict mode has been broken up in two
    tests: first a count without 609 and then counting 609s only.

    Note: Could have mocked GetMarcBiblio too, but decided to go this way.

    Test plan:
    [1] Run perl t/db_dependent/Authorities/Merge.t
    [2] (For UNIMARC users:) Run perl Merge.t -flavour MARC21
    [3] (For others:) Run perl Merge.t -flavour UNIMARC

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

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 5d279befed1b6faf829ab0ebd19357dbfc7c576e)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 41335270815dd88f9678531befef4ee8126baaa1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Feb 6 16:22:51 2017 -0300

    Bug 18068: ES - Fix location and (home|holding)branch facets

    This patch makes the 'Locations' facet work as expected (i.e. having the
    same behaviour it has for Zebra: picking the 952$c in MARC21 and 995e
    for UNIMARC).

    It also adds the code to handle holding and home library settings for
    facets and makes the facets show the library name instead of the branch
    code.

    The mappings are updated so the labels match what facets.inc expect to
    work properly.

    To test:
    - On master, do a search that returns biblios with items having
    homebranch set.
    => FAIL: Under the 'Locations' label on the facets you will notice
    branchcodes are shown.
    - Apply the patch
    - Restart memcached and plack (just in case, it was tricky)
    - Reset your mappings:
      http://localhost:8081/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1
    - Restart memcached and plack (again, not sure if needed)
    - Make sure this mappings are set:
      homebranch => HomeLibrary
      holdingbranch => HoldingLibrary
      (Note: it might not be set due to the place the yaml file is being picked)
    - Reindex your records:
      $ sudo koha-shell kohadev
     k$ cd kohaclone
     k$ perl misc/search_tools/rebuild_elastic_search.pl -d -v
    - Repeat the initial search
    => SUCCESS: 'Location' contains the right stuff, 'Home libraries' and
    'Holding libraries' too.
    - Run
     k$ prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
    => SUCCESS: Tests pass!
    - Sign off :-D

    Note: play with the 'DisplayLibraryFacets' syspref options.
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d115602c9881371d38f3b1c4bda66e979984b218)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit d4bf99e488740201832743bf9e8f5b0e4915902c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Feb 2 01:09:38 2017 +0100

    Bug 18045: Fix Reserves.t tests - caching issues

    If the cache has to be cleaned when marc structure is updated.

    Before this patch, if the age restriction was not mapped, Reserves.t
    failed with:
      Tag "" is not a valid tag. at t/db_dependent/Reserves.t line 523.

    Test plan:
    Just confirm that the tests still pass and that the changes make sense.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    It seems that only removing the key MarcSubfieldStructure- should be
    enough, but it does not hurt either to remove those four keys.

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 116301ae473075a6e183beb0027bd3657816b5e6)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 34eff6378614572735d768824695b104564ce76f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Feb 17 10:59:22 2017 +0100

    Bug 18136: Fix ExportRemoveFields pre-fill behaviour

    Looks like it's caused by bug 13190.
    Variable export_remove_fields is not sent to the template, let's
    retrieve the syspref's value using the TT plugin.

    Test plan:
    Fill ExportRemoveFields with something (100a for instance)
    Go on a checkout list page
    At the bottom, the "do not export fields" input box should be pre-filled
    with the content of the syspref

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

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit c6e09ca3877ced4afb05ea27175c46aa134dc3b3)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 7ee00feb7098c6413ae372fda5c03a14ccfbbe2c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Feb 15 17:14:11 2017 +0000

    Bug 18025: Simplify logic and avoid 1 call to ValidateBorrowernumber

    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    This is fine with me.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a471ad80bb70ed790cf7f544a45cdd3e61672ff4)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit c9ee7be2548bd47dbfe8dc4efb39b60869c36518
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Feb 15 17:13:41 2017 +0000

    Bug 18025: Fix test

    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    Seems to work fine

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 01f69eb8a258cead5f448c70e1efddc87a341299)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 6c8aa636cc13e970aa2a3b3b18dc87292ea60ab8
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Tue Jan 31 21:59:01 2017 +0000

    Bug 18025 - Expired password recovery links cause sql crash

    When a user gets an email, but doesn't act or visit it within two days,
         attempting to create a new one causes a collision. We should just
         delete the old one, assuming they still want to reset their
         password.

    To test:
    create yourself a borrower with a userid and password.
    Attempt a password recovery on the OPAC
    update the entry in the database for that user to have an expired token
    e.g. update borrower_password_recovery set valid_until = '2017-01-25
    03:25:26' where borrowernumber = 12;
    Attempt another password recovery operation - should error
    apply the patch
    Try it again - no error, new token is generated and additional email
    with new link is sent.

    Issue reproduced - is resolved by patch
    Signed-off-by: Marc Véron <veron at veron.ch>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e87dab6411a40ae0eba3d56032760d705ef62eaf)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 7c4463513433a65ccc8ea0c53a8124f727377a6c
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Wed Feb 15 06:52:32 2017 +0000

    Bug 18119: Fix comment in cataloguing.js

    Test plan:
    Go to cataloging, and try something which depends on javascript -
    collapse/uncollapse fields, open authority search window, ...
        -> without patch it is not working
        -> with patch it is working correctly

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 7698f6453c6c14b4986d573c33f0e49cd73652c6)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 7736967c6942c6e5a9cbaf0c4e307485f02704b6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Feb 2 10:28:21 2017 +0100

    Bug 17988: Add a comment to explain the line

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e9cd82e4ca754024009608242d7c9930ac248cff)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 7894a34479b1b3a120938687fbd856be9f756bfc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Feb 15 08:11:41 2017 +0000

    Bug 17780: Add a comment to explain the line

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 762188646904156e4b1c12bb4d2e04a060674e59)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit e2b22a3195ba0ddf8a80b3ea3bf77f1d9af456fc
Author: Oleg Vasylenko <synapse.ova at gmail.com>
Date:   Tue Jan 24 17:58:39 2017 +0200

    Bug 17780 - When choose an author in authority results new window shows a blank screen

    Select2 (Bug 13501) introduced divs and inputs that broke some assumptions about the expected HTML structure.
    This patch checks if input has name attribute, because some inputs in Select2 have not.

    To test:
    Try to add info from the authorities to field that has subfield with Select2 (subfield with authorised values on Koha 16.11+)

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    (cherry picked from commit 444bdcc2a50c64037c0f463200683009d8ae0b6e)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

Summary of changes:
 Koha/Patron/Password/Recovery.pm                   |   21 +++-
 Koha/Plugins.pm                                    |    2 +
 Koha/SearchEngine/Elasticsearch/QueryBuilder.pm    |   12 ++-
 Koha/SearchEngine/Elasticsearch/Search.pm          |    6 ++
 admin/searchengine/elasticsearch/mappings.yaml     |   27 ++++-
 installer/data/mysql/sysprefs.sql                  |    1 +
 .../prog/en/includes/checkouts-table.inc           |    2 +-
 .../authorities/blinddetail-biblio-search.tt       |    1 +
 koha-tmpl/intranet-tmpl/prog/js/cataloging.js      |    2 +-
 opac/opac-password-recovery.pl                     |   15 +--
 t/db_dependent/Authorities/Merge.t                 |  114 ++++++++++----------
 .../Koha_SearchEngine_Elasticsearch_Search.t       |   26 ++++-
 t/db_dependent/Passwordrecovery.t                  |   43 +++++++-
 t/db_dependent/Reserves.t                          |   21 +++-
 14 files changed, 217 insertions(+), 76 deletions(-)

hooks/post-receive
-- 
main Koha release repository