[koha-commits] main Koha release repository branch master updated. v19.11.00-1852-g4a84f7a9e0

[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, master has been updated
       via  4a84f7a9e0d13898d9a17071e3bd74f904a1e4f8 (commit)
       via  03ece9452a5eef8ca76dab413f4f5177f69797d1 (commit)
      from  c42674cfd98a2774881f48db5454bdb3392c57c8 (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 4a84f7a9e0d13898d9a17071e3bd74f904a1e4f8
Author: Phil Ringnalda <phil at chetcolibrary.org>
Date:   Sun Apr 19 02:37:49 2020 +0000

    Bug 20501: Don't cut strings when unhighlighting in intranet search results
    
    When you click Unhighlight on the search results of a search in the staff client
    when the search terms contain the same word twice, like "ma ma", the highlighted
    words disappear, and don't reappear if you click Highlight.
    
    This patch makes the same change to the intranet copy of jquery.highlight-3.js that
    bug 5844 made to the OPAC copy.
    
    Test plan:
    1) Without this patch, search in the intranet for ma ma and verify you have at least
       two matching records.
    2) Notice that the Ma in Material type: Book is highlighted.
    3) Click Unhighlight, and notice that it has become terial type: Book
    4) Apply this patch, repeat the search with a shift+reload to reload the .js
    5) Click Unhighlight, and verify that Material type: Book remains Material
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 03ece9452a5eef8ca76dab413f4f5177f69797d1
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Apr 20 18:41:37 2020 +0000

    Bug 25223: Make join of aqbasket and aqorders explicit
    
    This is simply a SQL change that makes things a bit easier to read
    and also prevents too much data being returned in a large system
    
    To test:
    1 - Have some orders in your system in the ordered status
    2 - Click the 'Ordered' amount for your budget from Acquisitions home
    3 - Note the view of orders, possibly screen shot
    4 - Apply patch
    5 - Restart all the things
    6 - Reload the ordered page
    7 - Confirm nothing has changed
    
    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 acqui/ordered.pl                                                 | 4 ++--
 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.highlight-3.js | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository