[koha-commits] main Koha release repository branch master updated. v18.11.00-1448-ge17500f

Thu May 9 20:39:49 CEST 2019

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  e17500f621ec9de63f4cedb2905885b494c81edf (commit)
       via  a0bb818b0bc5acb54a48bf84772d795b2eea53fc (commit)
       via  5f3c849014adad66deae505ff1ef8a7ddb8ea999 (commit)
       via  70c6c5dd93f9981a685d811c9e6adfc88508ffed (commit)
       via  1c61e60a17f06f6eb532fff9b7026fe99b818ded (commit)
       via  770212d134e780cef4ad5f0da20fb40a036c5978 (commit)
       via  89d764352f43004ebc33bea09c8557fd733a1b61 (commit)
       via  3b50efb7d5b8fd366d140be83a000d9afbdf4c02 (commit)
       via  cda1f7a65682573ad6ff7a219e518d508fcc18c6 (commit)
       via  c48af49ded481f498087eaf8e4cb530c4cc0a8e9 (commit)
       via  3e9550019a16d3944816788342eb808f3524d81e (commit)
       via  b40dd03ed54b6b08ad5b338d9d2d2de94de9cdf1 (commit)
       via  d3f4b50bdd476160d026012154c9f3463b94d37e (commit)
       via  503842ac6c37cdbab2a8868604bd6f1294c829b1 (commit)
      from  d38d78bcf4cc62d34aa953864cf6da87bef93c80 (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 e17500f621ec9de63f4cedb2905885b494c81edf
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu May 9 18:20:34 2019 +0000

    Bug 7088: DBRev 18.12.00.068

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit a0bb818b0bc5acb54a48bf84772d795b2eea53fc
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu May 9 17:22:25 2019 +0000

    Bug 7088: Compiled CSS

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 5f3c849014adad66deae505ff1ef8a7ddb8ea999
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Fri Apr 26 10:58:31 2019 +0100

    Bug 7088: (follow-up) Modify checkbox enabling

    As described in comment #50, we need to only enable renewal on items
    that are disabled in line with which sysprefs are enabled. So we now
    only enable renewal of on hold items if the AllowRenewalOnHoldOverride
    syspref is on and we only enable renewal of all other limited items
    when the AllowRenewalLimitOverride syspref is on.

    NOTE: The test plan below has changed substantially from previous
    iterations

    Test plan (you might want to make a coffee first...):

    - Apply patch
    - Rebuild CSS

    - Go to the Patron Details page for a patron who has an item on loan that would fulfil an outstanding loan request.
    - The patron also needs to have an item on loan that cannot be renewed for some other reason, say renewal limit has been reached
    => TEST: Observe that it is NOT possible to select either item for renewal

    - Enable the "AllowRenewalLimitOverride" syspref
    - Return to the Patron Details page
    - Check the "Override renewal restrictions" checkbox
    => TEST: Observe that it IS possible to select the the item that has reached the renewal limit, but not the item that is on hold

    - Disable the "AllowRenewalLimitOverride" syspref
    - Enable the "AllowRenewalOnHoldOverride" syspref
    - Return to the Patron Details page
    - Check the "Override renewal restrictions" checkbox
    => TEST: Observe that it is NOT possible to select the the item that has reached the renewal limit, but it IS possible to select the item on hold

    - Enable the "AllowRenewalLimitOverride" syspref
    - Enable the "AllowRenewalOnHoldOverride" syspref
    - Return to the Patron Details page
    - Check the "Override renewal restrictions" checkbox
    => TEST: Observe that it IS possible to select the the item that has reached the renewal limit, AND it IS possible to select the item on hold

    - Select the item that is on hold
    => TEST: Observe that an additional "On hold due date" input box is displayed
    - De-select the item
    => TEST: Observe that an additional "On hold due date" input box is hidden
    - Select the item
    - In the "On hold due date" input box, select a due date for the item
    - Click "Renew or check in selected items"
    => TEST: Observe that the item is renewed as usual
    - In the "Renewal due date" input box, select a due date
    - Remove the contents of the "On hold due date" input box
    - Click "Renew or check in selected items"
    => TEST: Observe that the item is renewed by falling back to the "Renewal due date" value if a value is not specified in the "On hold due date" input box
    - Remove the contents of the "Renewal due date" input box
    - Click "Renew or check in selected items"
    => TEST: Observe that the standard loan period is used for the renewal period if no due date is specified in either box
    - In the "On hold due date" input box, select a due date for the item
    - In the "Renewal due date" input box, select a different due date
    - Click "Renew all"
    => TEST: Observe that all non on hold items are renewed using the value in "Renewal due date" and on hold items are renewed using the value in "On hold due date"
    - From the main staff client from page, choose "Circulation", then choose "Renew"
    - Enter the barcode of an item that you know to be on hold and submit
    => TEST: In the alert box that appears, observe that a date picker is
    displayed
    - Choose a due date for this item, then click "Override and renew"
    => TEST: In the "Item renewed" box, observe that the item has been
    renewed to the date specified

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 70c6c5dd93f9981a685d811c9e6adfc88508ffed
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Tue Apr 23 10:44:08 2019 +0100

    Bug 7088: (follow-up) AllowRenewalLimitOverride fix

    This patch causes the click event listener on the #override_limit to be
    created if EITHER the AllowRenewalOnHoldOverride OR
    AllowRenewalLimitOverride sysprefs are enabled. Previously, it would
    only be created if the AllowRenewalLimitOverride syspref was enabled,
    which would cause the checkbox to be displayed but do nothing.

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 1c61e60a17f06f6eb532fff9b7026fe99b818ded
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Thu Feb 21 12:21:23 2019 +0000

    Bug 7088: (follow-up) Add pref to checkbox

    As per commit #29 here:
    https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7088#c29

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 770212d134e780cef4ad5f0da20fb40a036c5978
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Thu Feb 7 14:43:55 2019 +0000

    Bug 7088: (follow-up) Default hold checkbox display

    As per item 4 here:
    https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7088#c24

    Now, the checkbox for renewing on hold items behaves the same way as the
    checkbox for renewing items that have reached their renew limit. It is
    necessary to check the re-labelled "Override renewal restrictions"
    checkbox before it is possible to select on-hold items for renewal.

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 89d764352f43004ebc33bea09c8557fd733a1b61
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Wed Jan 30 11:05:17 2019 +0000

    Bug 7088: (follow-up) Set syspref default to off

    As per item 2 here:
    https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7088#c24

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 3b50efb7d5b8fd366d140be83a000d9afbdf4c02
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Wed Jan 30 11:03:10 2019 +0000

    Bug 7088: (follow-up) Remove script "type" attribute

    As per item 1 here:
    https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7088#c24

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit cda1f7a65682573ad6ff7a219e518d508fcc18c6
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Tue Nov 13 13:57:57 2018 +0000

    Bug 7088: (follow-up) Fix renewal limit bug

    There was a bug in that altering the state of the "Override renewal
    limit" checkbox was altering the appearance of the per-item "On hold"
    checkbox. This is incorrect, the "Override renewal limit" checkbox is
    unconnected with this bug.

    Sponsored-by: Cheshire Libraries Shared Services
    Sponsored-by: Halton Borough Council
    Sponsored-by: Sefton Council

    Signed-off-by: Andrew Farthing <Andrew.Farthing at sefton.gov.uk>

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit c48af49ded481f498087eaf8e4cb530c4cc0a8e9
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Fri Sep 21 11:09:13 2018 +0100

    Bug 7088: Allow renew on hold items with due date

    This patch adds the ability for items that are on hold to be renewed with a due date specfied by the user. It is enabled by the new "AllowRenewalOnHoldOverride" syspref. It is manifested in two locations:

    1. In the "Checkouts" table on the Patron Details screen. It is now possible to select on loan items that would otherwise fulfil a hold request to be renewed. When such an item is selected, an additional date selection box is displayed to allow the user to specify the due date for all on hold items that are to be renewed.

    2. In the Circulation > Renew alert screen. When a barcode of an on loan item that would ordinarily fulfil a hold request is entered, the usual alert is displayed indicating that the item is on hold, it is still possible to override this, and renew, however it is now also possible to specify a due date.

    Test plan:

    - Go to the Patron Details page for a patron who has an item on loan that would fulfil an outstanding loan request.
    - TEST: Observe that it is NOT possible to select this item
    - Enable the "AllowRenewalOnHoldOverride" syspref
    - Return to the Patron Details page for a patron who has an item on loan that would fulfil an outstanding loan request.
    - TEST: Observe that it IS possible to select this item
    - Select the item
    - TEST: Observe that an additional "On hold due date" input box is displayed
    - De-select the item
    - TEST: Observe that an additional "On hold due date" input box is hidden
    - Select the item
    - In the "On hold due date" input box, select a due date for the item
    - Click "Renew or check in selected items"
    - TEST: Observe that the item is renewed as usual
    - In the "Renewal due date" input box, select a due date
    - Remove the contents of the "On hold due date" input box
    - Click "Renew or check in selected items"
    - TEST: Observe that the item is renewed by falling back to the "Renewal due date" value if a value is not specified in the "On hold due date" input box
    - Remove the contents of the "Renewal due date" input box
    - Click "Renew or check in selected items"
    - TEST: Observe that the standard loan period is used for the renewal period if no due date is specified in either box
    - In the "On hold due date" input box, select a due date for the item
    - In the "Renewal due date" input box, select a different due date
    - Click "Renew all"
    - TEST: Observe that all non on hold items are renewed using the value in "Renewal due date" and on hold items are renewed using the value in "On hold due date"
    - From the main staff client from page, choose "Circulation", then choose "Renew"
    - Enter the barcode of an item that you know to be on hold and submit
    - TEST: In the alert box that appears, observe that a date picker is
    displayed
    - Choose a due date for this item, then click "Override and renew"
    - TEST: In the "Item renewed" box, observe that the item has been
    renewed to the date specified

    Sponsored-by: Cheshire Libraries Shared Services
    Sponsored-by: Halton Borough Council
    Sponsored-by: Sefton Council

    Signed-off-by: Andrew Farthing <Andrew.Farthing at sefton.gov.uk>

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 3e9550019a16d3944816788342eb808f3524d81e
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Wed Sep 19 16:29:19 2018 +0100

    Bug 7088: Add AllowRenewalOnHoldOverride syspref

    Enables the renewal of on hold items with specified due dates to be turned on/off

    Sponsored-by: Cheshire Libraries Shared Services
    Sponsored-by: Halton Borough Council
    Sponsored-by: Sefton Council

    Signed-off-by: Andrew Farthing <Andrew.Farthing at sefton.gov.uk>

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit b40dd03ed54b6b08ad5b338d9d2d2de94de9cdf1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed May 8 10:28:22 2019 -0500

    Bug 22790: Add a test

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit d3f4b50bdd476160d026012154c9f3463b94d37e
Author: Andreas Jonsson <andreas.jonsson at kreablo.se>
Date:   Fri Apr 26 19:44:59 2019 +0000

    Bug 22790: The system preference itemBarcodeInputFilter is not applied for barcodes inputed via SIP2

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 503842ac6c37cdbab2a8868604bd6f1294c829b1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri May 3 17:34:22 2019 -0400

    Bug 22847: Correctly displayed circ rule values for max_holds and maxissue*

    There are several things going wrong on the circulation rules screen. The global rule is displayed for specific libraries (even if the rule does not exist for the library), and max_holds is always blank.

    I have trouble finding the root of the issue, but I will propose a patch to fix both problem.

    Certainly a mismatch between bug 18887 and bug 18925.

    Test plan:
    0. Do not apply the patch
    1. Notice the issue on the circulation rules screen
    2. Apply the patch
    3. Confirm that the value you set are correctly displayed (and not the propagated ones!)

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

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

Summary of changes:
 C4/SIP/ILS/Item.pm                                 |    2 +-
 Koha.pm                                            |    2 +-
 Koha/Template/Plugin/CirculationRules.pm           |   12 +-
 circ/renew.pl                                      |    2 +-
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   10 ++
 .../intranet-tmpl/prog/css/src/staff-global.scss   |   19 ++++
 koha-tmpl/intranet-tmpl/prog/css/staff-global.css  |    2 +-
 .../prog/en/includes/checkouts-table-footer.inc    |   10 +-
 .../prog/en/includes/checkouts-table.inc           |    4 +-
 .../en/modules/admin/preferences/circulation.pref  |    6 +
 .../prog/en/modules/admin/smart-rules.tt           |    6 +-
 .../prog/en/modules/circ/circulation.tt            |    1 +
 .../intranet-tmpl/prog/en/modules/circ/renew.tt    |   22 ++++
 .../prog/en/modules/members/moremember.tt          |    1 +
 koha-tmpl/intranet-tmpl/prog/js/checkouts.js       |  115 +++++++++++++++-----
 .../intranet-tmpl/prog/js/pages/circulation.js     |    2 +-
 svc/renew                                          |    6 +
 t/db_dependent/SIP/Transaction.t                   |    8 +-
 19 files changed, 184 insertions(+), 47 deletions(-)

hooks/post-receive
-- 
main Koha release repository