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

[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, 17.05.x has been updated
       via  4d22af870d1051d963cab31169a7f536864e56b0 (commit)
       via  2ffe76350ee6373dc27ba8ac098a468875c2f4fb (commit)
       via  37da512f8115f296859e5df45bd042f97cf46775 (commit)
      from  9f150f1193a5f43bf081a21a1c55d54653e892e2 (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 4d22af870d1051d963cab31169a7f536864e56b0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jul 20 14:28:20 2017 -0400

    Bug 19135: Restore AllowHoldsOnPatronsPossessions behaviour
    
    Bug caused by
      commit bc39f0392bbebaad4c083f81308f652a325be042
      Bug 14695 - Add ability to place multiple item holds on a given record per patron
    
    Test Plan:
    1) Set AllowHoldsOnPatronsPossessions to "Don't"
    2) Check out an item to a patron
    3) Place a hold on that item for the same patron
    4) Note you are allowed to with no alert
    5) Delete the hold
    6) Apply this patch
    7) Place a hold on that item for the same patron
    8) Note you recieve an alert now
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
    
    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 46ff8df19544e3e7c16a4e3f21b3b14bc043dd88)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 2ffe76350ee6373dc27ba8ac098a468875c2f4fb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Oct 5 10:41:33 2017 +0200

    Bug 19415: FindDuplicateAuthority is searching on biblioserver since 16.05
    
    Commit b4392018bc1f9bf6a2f7dfe70b488856ad3a3897 [Bug 12478: make things using SimpleSearch use the new version] changed sub FindDuplicateAuthority and replaced this call (from 3.22.x) in 16.05 (pushed April 2016):
        my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, 0, 1, [ "authorityserver" ] );
    
    The new call does unfortunately not include the authorityserver:
        my ($error, $results, $total_hits) = $searcher->simple_search_compat( $query, 0, 1 );
    Simple_search_compat redirects to C4/Search/SimpleSearch and SimpleSearch assumes a biblioserver if no server is passed.
    
    This effectively makes FindDuplicateAuthority useless since we will no longer find duplicates and we could see an error like this in the log:
        16:51:42-04/10 zebrasrv(51) [request] Search biblios ERROR 114 1 1+0 RPN @attrset Bib-1 @and @attr 1=authtype PERSO_NAME @attr 1=Heading Moerenhout
    
    The fix is obviously trivial.
    
    Test plan:
    [1] Go to Authorities.
    [2] Add a new authority PERSO_NAME with 100a Moerenhout.
    [3] Repeat step 2. Verify that you get the duplicate authority warning.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 56500e8e676782155c5717e8db9786af394252d8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 37da512f8115f296859e5df45bd042f97cf46775
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Wed Sep 27 17:59:55 2017 +0300

    Bug 19374: CircSidebar overlapping transferred items table
    
    When CircSidebar is activated, "Transferred items" table at
    Circulation -> Transfers goes under the sidebar. This patch fixes the issue.
    
    To test:
    1. Enable CircSidebar system preference
    2. Go to cgi-bin/koha/circ/branchtransfers.pl
    3. Enter a barcode and click submit
    4. Observe transferred items table under the circulation side bar
    5. Apply patch
    6. Enter a barcode and click submit
    7. Observe transferred items is now correctly displayed
    8. Also test with CircSidebar system preference deactivated
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Bug 19374: (follow-up) Remove stray closing div tag
    
    To test:
    1. Apply first patch and validate the document e.g. here
       https://validator.w3.org/#validate_by_input
    2. Observe "Stray end tag div." error
    3. Apply this patch and validate again
    4. Observe no errors
    5. Go through test plan from first patch to make sure things still look nice
    
    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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 07764f2b3114e5ccb72f7737e316d2cda3ad5068)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/AuthoritiesMarc.pm                                           |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt |    4 ++--
 reserve/request.pl                                              |    3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository