[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.03-13-g48507259b4

[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, 20.05.x has been updated
       via  48507259b413c86a216a127f2ba1457edb3e83d4 (commit)
       via  7d035b39d20353a004c0f24ce2e2e0d24286e474 (commit)
      from  ae54212e7d05564332dbb28b99ed61103cdecaae (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 48507259b413c86a216a127f2ba1457edb3e83d4
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Aug 13 12:56:33 2020 +0000

    Bug 25872: Fix scoping of $limits
    
    The code in build_query_compat contained a 'my' in the assigning of limits for the search in a conditional
    
    This meant the limits were being set correctly during the conditional, but we blanked when passed to the rest
    of the code. The effect was that the searches worked, however, the template params to repeat the search were
    incomplete.
    
    Removing the my ensures the same limits are applied during search and on re-sorting
    
    To test:
    1 - Enable Elasticsearch
    2 - On OPAC perform advanced search, selecting only an itype, ccode, or LOC limit
    3 - Attempt to sort results
    4 - You are returned to Advanced search
    5 - Apply patch
    6 - Repeat
    7 - It sorts!
    
    Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 43dc505a52a2679e40a22ff610c91552cd8f2fd1)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 7d035b39d20353a004c0f24ce2e2e0d24286e474
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Aug 13 12:55:21 2020 +0000

    Bug 25872: Unit tests
    
    Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2f3a886f7b23f37f04a687cb0c1755c3195c2ce6)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 Koha/SearchEngine/Elasticsearch/QueryBuilder.pm               | 2 +-
 t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository