[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.04-75-gef93ed6

Mon Oct 15 14:55:33 CEST 2018

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, 18.05.x has been updated
       via  ef93ed60acf10d47a92669490eff1acda3abc135 (commit)
       via  c3591642dc0f11af916723a08930dca10f0c0b4c (commit)
       via  ee4fbd587f97768106367aab9b9746f9b09dffbf (commit)
       via  4b139ba1954b5c1451f842996ae42511c9369c05 (commit)
      from  8802d32b7f4e9f4642d3b0f7f7f8a871b85662ed (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 ef93ed60acf10d47a92669490eff1acda3abc135
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Wed Sep 26 14:04:00 2018 +0100

    Bug 20548: (follow-up) Fix unit tests

    Removed the "Backend create: copyright clearance" unit test since we no
    longer have a "copyrightclearance" stage, hence we don't have a block in
    the template handling it, hence the test failure!

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit e6bf76b9c712913e549f43a30830ea612c73befa)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit c3591642dc0f11af916723a08930dca10f0c0b4c
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Mon Apr 9 15:04:35 2018 +0100

    Bug 20548: Remove copyright clearance for staff

    This patch removes the erroneously added workflow that requires staff
    users to agree to the copyright clearance declaration defined in the
    ILLModuleCopyrightClearance preference. Only OPAC users should be
    required to accept the declaration.

    To test:
    1) Ensure you have at least one ILL backend available:
      https://wiki.koha-community.org/wiki/ILL_backends
    2) Ensure you have the "ILLModule" preference enabled
    3) Add some text to the "ILLModuleCopyrightClearance" preference
    4) As an OPAC user make an ILL request:
      a) Navigate to a search results page in the catalog
      b) Click the "Make an Interlibrary Loan request" link at the bottom
      c) Choose "Create a new request", then select a backend
      d) Observe the text you added earlier is displayed with buttons for
      agreeing or disagreeing
    5) As a staff user, select the "ILL requests" button on the front page of
    the intranet site
      a) Choose "Create a new request", then select a backend
      b) Observe that you are NOT prompted to agree to the text you added
      earlier

    Assigned-to: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
    Signed-off-by: Barry Cannon <bc at interleaf.ie>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit ad35c9702eb1da9bec331312701e71ce6ab5cf91)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit ee4fbd587f97768106367aab9b9746f9b09dffbf
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Oct 5 17:05:19 2018 +0000

    Bug 16420: Buttons inconsistent between "Hold found" and "Hold found (waiting)" dialogs in checkin

    This patch makes minor changes to the text of hold confirmation buttons
    in the checkin process in order to make them more consistent.

    Also changed: Removed the "danger" class from the "Ignore" button for
    readability and consistency's sake.

    To test, apply the patch and check in an item which is on hold for a
    patron at your logged-in library. The hold confirmation dialog's buttons
    should read "Confirm hold," "Print slip and confirm," and "Ignore."

    Confirm the hold, then check in the same item again.

    In the dialog, the buttons should read "Confirm hold," "Print slip and
    confirm," and "Cancel hold."

    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 96c2df5804ce3ac84e5963d6b9764553a97a6978)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 4b139ba1954b5c1451f842996ae42511c9369c05
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Oct 4 14:08:32 2018 -0300

    Bug 21500: Remove warnings in rotating collections

    To test:
    - Go to Tools > Rotating collections
    => FAIL: Some warinings on the logs
    - Apply this patch
    - Reload page
    => SUCCESS: No warinings
    - Sign off :-D

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 40803d30359f347417999429b612fcece9fc96f9)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 Koha/Illrequest.pm                                 |   33 ++++++++++----------
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    6 ++--
 .../prog/en/modules/ill/ill-requests.tt            |   14 +--------
 opac/opac-illrequests.pl                           |    1 +
 rotating_collections/addItems.pl                   |    5 +--
 t/db_dependent/Illrequests.t                       |   17 +---------
 6 files changed, 26 insertions(+), 50 deletions(-)

hooks/post-receive
-- 
main Koha release repository