[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-175-g9f150f1

Wed Oct 25 10:13:37 CEST 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, 17.05.x has been updated
       via  9f150f1193a5f43bf081a21a1c55d54653e892e2 (commit)
       via  b7140dcd50a69396856cd5f66d9fcd74c579407d (commit)
       via  e1fa378ec50fde01b87d6ee2598f7360bb2795bf (commit)
       via  1edf743c90e45fc2812b535911f6324c72bf1d9b (commit)
       via  31dcc7c7d5552d51c138fa37e789e248358673ff (commit)
       via  197c2f7aa4519ab76628639150ec26a0b1843ec6 (commit)
       via  f151ce91ccb6eac7cf8a35dcc5e614181ee601f1 (commit)
       via  b5497c87ccc7ee2c01f4177e335aee25fbeb6c53 (commit)
       via  9a5ee28fe6a67e66a8407f8838f2acf6606c6a4d (commit)
       via  734e5df8dfeb272c349e9b9d52ef1bdd4bc55d1b (commit)
       via  71eeb5054c0fac6a6e4d94d185f972bfb3120c52 (commit)
      from  1a2e52f494918cb8ad4a529ed9d099281501f179 (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 9f150f1193a5f43bf081a21a1c55d54653e892e2
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Sep 19 07:13:53 2017 +0000

    Bug 19329: Update IntranetSlipPrinterJS system preference description.

    Test plan:
    0) Apply the patch
    1) Go to administration -> system preferences -> staff client
    2) Read the description by IntranetSlipPrinterJS and confirm it's right

    Signed-off-by: Marc Véron <veron at veron.ch>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c7b2d9bcf37dcded7cba49b1e520a0234850adf7)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b7140dcd50a69396856cd5f66d9fcd74c579407d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 16 15:12:07 2016 +0100

    Bug 15173: Restore SubfieldsToAllowForRestrictedEditing

    Bug 7673 introduced SubfieldsToAllowForRestrictedEditing but bug 12176
    broke it assuming that only selects were impacted by this feature.

    Test plan:
    Go back on bug 7673 and confirm that
    SubfieldsToAllowForRestrictedEditing is working as expected with this
    patch applied.

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    For clarification, the item fields that are entered in
    SubfieldsToAllowForRestrictedEditing should EXCLUDE the desired
    fields you want to disable.

    Test plan (updated to test the scenario in the bug Description):
    1. Create a patron with only the following permissions:
        - catalogue (Required for staff login)
        - editcatalogue -> edit_catalogue
        - editcatalogue -> edit_items
        - editcatalogue -> edit_items_restricted
    2. Navigate to Administration -> Global system preferences -> Cataloging
        -> Record Structure -> SubfieldsToAllowForRestrictedEditing
    3. In the input field for SubfieldsToAllowForRestrictedEditing enter in
        all the 952 fields EXCEPT the ones desired to be disabled. In this
        case, we want to disallow editing of 952$2, 952$a, 952$b, 952$e, 952$h,
        and 952$o so we enter the following into the
        SubfieldsToAllowForRestrictedEditing (without quotes) "952$0 952$1
        952$3 952$4 952$5 952$7 952$8 952$c 952$d 952$f 952$g 952$i 952$j
        952$p 952$t 952$u 952$v 952$w 952$x 952$y 952$z"
    4. Click Save all Cataloging preferences
    5. Login to the staff client as the created restricted editing patron
    6. Edit an item
    7. Note that all fields except for the ones excluded from the syspref
        are editable

    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c84d03c582976cb590c62b25d59505b982a71d97)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e1fa378ec50fde01b87d6ee2598f7360bb2795bf
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Oct 13 10:05:08 2017 +0000

    Bug 18374: (QA follow-up) Fix auto truncation for field:"value"

    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c991ac6b6184e299108b5f69d3e0e50dcfc6548d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 1edf743c90e45fc2812b535911f6324c72bf1d9b
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Oct 13 09:53:04 2017 +0000

    Bug 18374: (QA follow-up) Simplify _truncate_terms

    By using a different split regex, we can simplify a bit the process of
    appending '*' to every word of the query

    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 6426a82014aacd738dd94ca2ff1c9056af893d45)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 31dcc7c7d5552d51c138fa37e789e248358673ff
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Oct 6 15:37:38 2017 +0000

    Bug 18374: (follow-up) Add support and tests for quoted strings

    To test:
    1 - prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
    2 - do some searches in staff client and test results

    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d099dc13bb4b9aa991caa0feaf24bed59c3c4844)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 197c2f7aa4519ab76628639150ec26a0b1843ec6
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Sep 29 16:12:23 2017 +0200

    Bug 18374: (QA follow-up) Tidy up code

    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e54065197515ec265d4bab6ceead35d4456ef0e5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit f151ce91ccb6eac7cf8a35dcc5e614181ee601f1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Sep 12 12:15:07 2017 -0300

    Bug 18374: (QA follow-up) Remove warning in Elasticsearch/Search.pm

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit cfa1aac9554ea9cba09aec30a4b1f85c09cb5f63)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b5497c87ccc7ee2c01f4177e335aee25fbeb6c53
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Apr 3 14:30:44 2017 -0400

    Bug 18374: Respect QueryAutoTruncate syspref in Elasticsearch

    This patchset adds a subroutine '_truncate_terms' to the ES QueryParser.

    If QueryAutoTruncate is enabled this function will be called for any
    search to add wildcard '*' to all terms

    To test:
    1 - Enable Elasticsearch and have some records indexed
    2 - Search for partial terms
    3 - Note they fail unless '*' is appended
    4 - Apply patch, leave QueryAutoTruncate disabled
    5 - Note partial term searches still fail
    6 - Enable QueryAutoTruncate
    7 - Note partial term searches succeed
    8 - Do some regular and advanced searches to make sure results are as
    expected

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 4c4d982ae45a3763fd70faedf1bbac225213de19)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 9a5ee28fe6a67e66a8407f8838f2acf6606c6a4d
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Apr 6 14:27:50 2017 -0400

    Bug 18374: QueryAutoTruncate unit tests

    To test:
    1 - Apply just this patch - should fail
    2 - Apply the other patch - should pass

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8b3d53db08a5d27a22df338ea4c3c2426992c12a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 734e5df8dfeb272c349e9b9d52ef1bdd4bc55d1b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Oct 13 09:03:25 2017 +0200

    Bug 19296: (QA follow-up) Correct comment in populate_orders

    Just replacing a wrong - by a correct + sign in the comment. The code
    itself is fine.

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 08357845c3db3b68990e655de3364bc0f4649fc1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 71eeb5054c0fac6a6e4d94d185f972bfb3120c52
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Sep 12 16:57:47 2017 +0000

    Bug 19296: Allow all tax processing to happen in C4::Acquisition::populate_order_with_prices

    To test:
     1 - Create an order file that includes prices and items
    (MarcFieldsToOrder)
     2 - Stage the file
     3 - Set vendor to 'prices exclude tax'
     4 - Open a basket and add from the file
     5 - View the items in the basket
     6 - Prices are reduced by the tax rate and tax is calculated to return
    prices to the value in the file
     7 - Apply patch
     8 - Repeat steps 1-6
     9 - Prices should now calculate correctly
    10 - Repeat with 'MarcItemFieldsToOrder'

    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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d8b89eead0c7576a295679b3ef3bb90e7dec8283)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |    2 +-
 Koha/SearchEngine/Elasticsearch/QueryBuilder.pm    |   32 ++++++++
 Koha/SearchEngine/Elasticsearch/Search.pm          |    4 +-
 acqui/addorderiso2709.pl                           |   40 +++-------
 cataloguing/additem.pl                             |   33 ++++----
 .../en/modules/admin/preferences/staff_client.pref |    2 +-
 .../prog/en/modules/cataloguing/additem.tt         |   40 +++++++---
 .../Koha_SearchEngine_Elasticsearch_Search.t       |   79 +++++++++++++++++++-
 8 files changed, 170 insertions(+), 62 deletions(-)

hooks/post-receive
-- 
main Koha release repository