[koha-commits] main Koha release repository branch master updated. v18.11.00-1594-gb67462d

Thu May 23 17:18:37 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, master has been updated
       via  b67462d471a54bf342295cbc5e46373d065bab7e (commit)
       via  bb2459f12ed7c8151ae0690850ca5351d64c4aac (commit)
       via  6586762ff3a52da3316aec4f55ce3ecbdbd133b6 (commit)
       via  d963a3854c962bda3361213f2ad8e7626311d20b (commit)
       via  189bde4a1d043a25a0eddcc07401b7946653c3b1 (commit)
       via  6ae2edb033ed7ebc2683026f42cf9400babd604b (commit)
       via  04d990c71d34d0c44999cfdf80e8379959d14de8 (commit)
       via  6cf717e6c9e377850674ad6462480884a047145b (commit)
       via  085cb4de51c528b6a50b60f591f6b5ac426efd6a (commit)
       via  53545ba739e1706da7f3e52c145f0f6c8bbfb18c (commit)
       via  cbacf68d7fb554bd949e2f498c1eda86b34ef97f (commit)
       via  9532a3edeacd8fb3df67e8a01ed4e89069ffc017 (commit)
       via  ae2f21e74dc68c305d88ba26f60282550e3c448b (commit)
       via  fe053f0ee06508d1c6e2675dcadc535075900b6e (commit)
      from  0ed7cc0c577720f262110427ebe4d0922aa6ca99 (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 b67462d471a54bf342295cbc5e46373d065bab7e
Author: Henry Bolshaw <bolshawh at parliament.uk>
Date:   Wed May 22 15:02:40 2019 +0000

    Bug 22965: fixes typo on classification sources description on admin homepage

    Removed comma from description.

    Test plan:
    1. Go to Admin homepage
    2. Check Classification Sources description
    3. Verify that comma after i.e. has gone removed

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

commit bb2459f12ed7c8151ae0690850ca5351d64c4aac
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed May 22 13:32:14 2019 +0000

    Bug 22962: Punctuation error in RisExportAdditionalFields

    To test
    1/ Go to systempreferences search for RisExportAdditionalFields
    2/ See the extra , on the first line
    3/ Apply the patch
    4/ See it is fixed

    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>

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

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

commit 6586762ff3a52da3316aec4f55ce3ecbdbd133b6
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Apr 23 10:37:10 2019 +0000

    Bug 22746: Fix typos in add mana comment modals again

    Test plan:
    1) Create subscription from Mana
    2) On subscription detail page: report mistake > other a modal is shown
    it should be exactly 'Please enter a new commment (max 35 characters)'
    3) The same in mana search results and in reports

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

commit d963a3854c962bda3361213f2ad8e7626311d20b
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue May 21 11:12:44 2019 +1000

    Bug 15221: SIP server always sets the alert flag when item not returned

    The checked in response from the ACS always has the alert bit set to
    true, even when using the checked_in_ok option.

    This patch sets the alert bit to 0 when checked_in_ok is used and
    the item is checked in without a preceding checkout.

    To test:

    0) Create patron in web interface with a cardnumber and userid of "staff" with a password
    that matches the account in SIPconfig.xml. Also set their branch to CPL
    (also matching SIPconfig.xml).
    1) Create an item with a barcode of 'test'
    2) Choose a patron to check out to and record their borrowernumber

    In one terminal:
    3) cd to your git directory (e.g. /home/koha/koha)
    4) perl ./C4/SIP/SIPServer.pm ~/koha-dev/etc/SIPconfig.xml

    In another terminal:
    5) cd to your git directory (e.g. /home/koha/koha)
    6) perl ./misc/sip_cli_emulator.pl -l CPL -su staff -sp <password> --port=6001 --address=localhost --item test -m checkin --patron <borrowernumber>
    NOTE: You need to replace <borrowernumber> with the borrowernumber from Step 2, and <password> with the password from Step 0.

    Before patch:

    koha at 9ec653ab82ce:~/koha$ perl ./misc/sip_cli_emulator.pl -l CPL -su staff -sp <password> --port=6001 --address=localhost --item test -m checkin --patron <borrowernumber>
    Attempting socket connection to localhost:6001...connected!
    SEND: 9300CNstaff|COStaff1|CPCPL|
    READ: 941

    Trying 'checkin'
    SEND: 09N20190521    00310320190521    003103APCPL|AOCPL|ABtest|AC<password>|BIN|
    READ: 101YNY20190521    003106AOCPL|ABtest|AQCPL|AJTest|

    After patch:
    koha at 9ec653ab82ce:~/koha$ perl ./misc/sip_cli_emulator.pl -l CPL -su staff -sp <password> --port=6001 --address=localhost --item test -m checkin --patron <borrowernumber>
    Attempting socket connection to localhost:6001...connected!
    SEND: 9300CNstaff|CO<password>|CPCPL|
    READ: 941

    Trying 'checkin'
    SEND: 09N20190521    01000020190521    010000APCPL|AOCPL|ABtest|AC<password>|BIN|
    READ: 101YNN20190521    010004AOCPL|ABtest|AQCPL|AJTest|

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

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

commit 189bde4a1d043a25a0eddcc07401b7946653c3b1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Dec 7 14:43:18 2018 -0300

    Bug 21831: Allow move all fields even if destination field is different

    Tests exist in t/SimpleMARC.t to prove that it works and it is possible.
    I do not remember what I wrote this limitation.

    Signed-off-by: Jon Knight <j.p.knight at lboro.ac.uk>

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

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

commit 6ae2edb033ed7ebc2683026f42cf9400babd604b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu May 16 14:07:25 2019 -0500

    Bug 22917: Fix typo in another test file

    It looks safe to do it here and now.

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

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

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

commit 04d990c71d34d0c44999cfdf80e8379959d14de8
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Thu May 16 16:55:16 2019 +0100

    Bug 22917: Fix a typo in an output_pref call

    Due to a type in a call to output_pref (datenonly vs dateonly) we were
    comparing logactions within a minutes accuracy. Counting the logs for
    the day would be sufficient for the test ;)

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

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

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

commit 6cf717e6c9e377850674ad6462480884a047145b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed May 15 19:46:48 2019 -0500

    Bug 22917: Prevent Circulation.t if tests ran too slowly

    After bug 21213 we wanted to know why Circulation.t was failing randomly on a given test.
    Since it is pushed, it failed (at least) twice, with the same error:

        #   Failed test 'AddReturn must have debarred the patron'
        #   at t/db_dependent/Circulation.t line 3112.
        #          got: ''
        #     expected: '1'
        # AddReturn returned message $VAR1 = {
        #           'WasReturned' => 1
        #         };

        #   Failed test 'Test at line 1918'
        #   at t/db_dependent/Circulation.t line 3116.
        #          got: '0'
        #     expected: '1'

        #   Failed test 'Test at line 1918'
        #   at t/db_dependent/Circulation.t line 3119.
        #          got: undef
        #     expected: '2019-05-30'
        # Looks like you failed 3 tests of 21.

    The test at line 3113 expects the flags 'WasReturned' and 'Debarred' to be set,
    but only WasReturned is.
    Which means the patron has not been debarred. It is not because the checkout has
    not been detected as overdue.

    If you apply only the first patch you will see that the tests are failing with
    the exact same failures.
    Indeed, if due_date is not passed to test_debarment_on_checkout, it is set to now (dt_from_string).
    However, if the call and the test of the parameters inside the subroutine takes
    more than 1 second,
    then due_date will be after what we really expect. To reproduce that, we add
    1 minute to due_date and we observe the tests failing.

    The trick here (and we should have in all our tests) is to mock
    DateTime->now to make sure dt_from_string will always return the same
    value, it is what we expect from our tests (in 99.9% of the cases at
    least).

    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>

commit 085cb4de51c528b6a50b60f591f6b5ac426efd6a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed May 15 19:45:06 2019 -0500

    Bug 22917: Recreate the failure

    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>

commit 53545ba739e1706da7f3e52c145f0f6c8bbfb18c
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Dec 24 12:52:53 2018 +0000

    Bug 22046: Simplify and unify the code for get_matches

    To test:
    1 - Stage some records for import
    2 - Manage the records
    3 - Use several different matching rules and note the results
    4 - Apply patch
    5 - Try several matching rules again and note the results have not
    changed
    6 - Try under both search engines (Zebra and ES)

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

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

commit cbacf68d7fb554bd949e2f498c1eda86b34ef97f
Author: root <root at f1ebe1bec408>
Date:   Fri May 17 12:30:47 2019 +0000

    Bug 22934: Add missing use statement

    Also fixes a typo

    To test:
    1 - Add a subscription to a record
    2 - Add an additional field in the admin section
    3 - Edit the subscription and define the additional field
    4 - Ensure you can view the record in the staff client and opac
    5 - Without patch ,in the subscription detail page,click the link of the record title. => software error.
    6 - Apply the patch. => no error anymore.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Bin Wen <bin.wen at inlibro.com>

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

    Fixed another typo on L21

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

commit 9532a3edeacd8fb3df67e8a01ed4e89069ffc017
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed May 15 08:41:01 2019 +0200

    Bug 22705: Change default value of cxn_pool to 'Static'

    'Static' is the default value of Search::Elasticsearch and for a good
    reason : it works in most cases, unlike the 'Sniff' option

    To test:
    1 - Apply patch
    2 - Edit koha-conf.xml
    3 - Add '<cxn_pool>Static</cxn_pool>' to the elasticsearch stanza
    4 - Restart all the things!
    5 - Reindex ES, it works
    6 - Set SearchEngine to ES, try searching
    7 - It works!

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

commit ae2f21e74dc68c305d88ba26f60282550e3c448b
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Thu May 16 18:38:23 2019 +0000

    Bug 22905: (QA follow-up) remove bad warn

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

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

commit fe053f0ee06508d1c6e2675dcadc535075900b6e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu May 16 13:20:53 2019 -0500

    Bug 22905: Fix update of suggestion's status if branchcode filter is 'all'

    Because of the "Library" filter on the left of the "Suggestions management" screen, there is something wrong happening:

    1. Create a suggestion from library A, login from library B
    2. Go to  Home › Acquisitions › Suggestions management
    => The suggestion does not appear - OK
    3. In the filter on the left, select "all library"
    => The suggestion appears on the pending tab - KO
    4. Select the suggestion and mark is as 'Accepted'
    => The suggestion still appears on the pending tab - Failure

    The log says:
    DBD::mysql::st execute failed: Cannot add or update a child row: a foreign key constraint fails (`koha_kohadev`.`suggestions`, CONSTRAINT `suggestions_ibfk_branchcode` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE SET NULL ON UPDATE CASCADE) [for Statement "UPDATE `suggestions` SET `accepteddate` = ?, `branchcode` = ?, `currency` = ?, `manageddate` = ?, `price` = ?, `reason` = ?, `suggesteddate` = ?, `total` = ? WHERE ( `suggestionid` = ? )" with ParamValues: 0='2019-05-14T15:48:18', 1="", 2="CAD", 3='2019-05-14T15:48:18', 4="0.00", 5="", 6='2019-05-14T00:00:00', 7="0.00", 8=3] at /usr/share/perl5/DBIx/Class/Storage/DBI.pm line 1836.

    Let forget what could have happened earlier in the script and do it the regular
    way, from $input. Then call ModSuggestion with only what we need.

    Test plan:
    Confirm that the steps described before work as expected once this patch is applied

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

    https://bugs.koha-community.org/show_bug.cgi?id=22907

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

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

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

Summary of changes:
 C4/MarcModificationTemplates.pm                    |    3 --
 C4/Matcher.pm                                      |   27 +++++--------
 C4/SIP/ILS.pm                                      |    1 +
 Koha/AdditionalFieldValue.pm                       |    3 +-
 Koha/SearchEngine/Elasticsearch.pm                 |    2 +-
 etc/koha-conf.xml                                  |    3 ++
 .../mana/mana-subscription-search-result.inc       |    2 +-
 .../prog/en/includes/reports-toolbar.inc           |    2 +-
 .../prog/en/modules/admin/admin-home.tt            |    2 +-
 .../en/modules/admin/preferences/cataloguing.pref  |    2 +-
 suggestion/suggestion.pl                           |   40 +++++++++++++-------
 t/db_dependent/Circulation.t                       |    9 ++++-
 t/db_dependent/Log.t                               |    2 +-
 13 files changed, 54 insertions(+), 44 deletions(-)

hooks/post-receive
-- 
main Koha release repository