[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.03-48-g8d5a503

Mon Sep 9 10:23:52 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, 19.05.x has been updated
       via  8d5a50384fb65a508b0cf944e6f6c070df888aaf (commit)
       via  fec88c6414a7269a91d07388c00784c09bbb0494 (commit)
       via  5a20e111e2e26138dc2ecb7a67e9d6fd69be8c97 (commit)
       via  48b479d4893e03c3ca8b995136621f3409bb363f (commit)
       via  865aa87d75895b37e2d690c5e740300b12ecafc0 (commit)
       via  801b6d4398f560a8a9218e3cf84d20a23aea2c0d (commit)
       via  3964a026604e870f1a0958eef99c22ddd6b34a3b (commit)
       via  ad1ba3604c2054a6d7eb22ff26f3f4a8857683d0 (commit)
       via  8458626205fececfb1486cbb42b57f6e0c1af8e3 (commit)
      from  f4f67de5a211e8a8f95cd8f4b2096f57ddcfeb34 (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 8d5a50384fb65a508b0cf944e6f6c070df888aaf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sat Jun 22 19:29:42 2019 -0500

    Bug 22786: Prevent fund creation for locked budgets

    If a budget is locked, there is a "New fund for $budget" link that is
    disabled but clickable.
    We should ensure that the link is not clickable and prevent it at
    controller level (do we need it at module level, ie.
    Koha::Acquisition::Fund->store?)

    Test plan:
    - Create a budget, lock it
    - Go to /cgi-bin/koha/admin/aqbudgetperiods.pl
    - Click on the name of the budget you just created
    => The "New > New fund for $budget_name" button should be disabled
    - Click it anyway
    => Without this patch the form to add a new fund is displayed
    => With this patch applied nothing happens
    - Hit /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=XXX
    With XXX the budget's id
    => Without this patch the form is displayed
    => With this patch applied you get a message:
      "The budget is locked, fund creation is not possible."
    And you are not able to create a new fund

    QA notes:
    1. See description
    2. The add_validate op can still be forced, let trust librarians with
    administration permissions for now.

    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 9215ca42d28bec10f55a9c660bb5816045bb9656)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit fec88c6414a7269a91d07388c00784c09bbb0494
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 30 12:25:45 2019 +0000

    Bug 23518: Problem with borrower search autocomplete

    This patch fixes a bug introduced by my patch for Bug 23405: Keyboard
    navigation of patron autocomplete results was broken because I
    incorrectly assumed that the autocomplete "select" action was redundant
    because keyboard navigation would trigger the selected link. It doesn't!

    This patch adds the "select" action back to the autocomplete
    configuration, explicitly defining a redirect to match the URL which is
    followed if the user uses the mouse to click a result.

    To test you should have a patron in your database which has no card
    number. Make sure CircAutocompl is enabled.

    - From the circulation home page, type a patron name in the "Check out"
      form and wait for autocomplete search results to display.

    - Making a selection from the autocomplete results should work by
      clicking with a mouse OR using the arrow keys and TAB or ENTER.

    - Test with patrons with and without card numbers.

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit b94b58aa746188ee3699a2e4bc0a6b24d2dd86c5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5a20e111e2e26138dc2ecb7a67e9d6fd69be8c97
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 5 14:25:51 2019 +0000

    Bug 23210: (follow-up) Log in for tags link should trigger modal

    This patch modifies the "Log in to add tags" link on the OPAC search
    results page, adding the class which is used elsewhere in the OPAC
    templates for triggering the login modal.

    Also: Removed an unnecessary period.

    To test, apply the patch and follow the original test plan. Clicking the
    "Log in to add tags" link should trigger the login modal. After logging
    in you should be returned to the page you were on.

    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 66b6c76d96b172bbd2b9f90640f7701a6ba4530c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 48b479d4893e03c3ca8b995136621f3409bb363f
Author: Lucas Gass <lucas at bywatersolutions.com>
Date:   Fri Aug 2 22:21:40 2019 +0000

    Bug 23210: login4tags should be a link and included in every search result

    TEST PLAN:

    1. Make sure TagsEnabled and TagsInputOnList are set to allow.
    2. Don't be logged into the OPAC.
    3. Make a search and notice the 'Log in to add tags' text is not a link
       on the results page.
    4. Apply patch
    5. Refresh OPAC results page
    6. 'Log in to add tags' takes you to the login page.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 99d8d2db2c4f44cbb91a069ed3a8dd7894e0218a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 865aa87d75895b37e2d690c5e740300b12ecafc0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 23 14:36:36 2019 +0000

    Bug 23397: (QA follow-up) Replace mod 2 by last

    Looks better: Maps | Books | Continuing Resources

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 4148b222b373b262a16a99faa314a47fa3994c0e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 801b6d4398f560a8a9218e3cf84d20a23aea2c0d
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Aug 23 13:14:57 2019 +0000

    Bug 23397: (follow-up) Split and display itemtypes

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 36a16efec36b4c4d57231c0f459f76cb2bbaee7d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 3964a026604e870f1a0958eef99c22ddd6b34a3b
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Jul 29 18:12:21 2019 +0000

    Bug 23397: Fix grouping of orders in acqui scripts

    Bug 21622 attempted to fix some grouping for strict mode, however, it failed to take into account that single order can have multiple item types.

    To recreate:
    1 - Place an order for 4 copies of a title in acq
    2 - Make sure you are creating orders when ordering (AcqCreateItems syspref and/or when creating basket)
    3 - Set three items to one type, and one to another
    4 - Go to Acqui-Home and click 'ordered' for the used budget
    5 - Note the line is duplicated for each itemtype in the order
    6 - Recieve the items and note the same issue on 'Spent'
    7 - Place another order as before so you have the problem in both ordered.pl and spent/pl
    8 - Apply patch
    9 - Note orders are no longer duplicated

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 1f40de2931f19cce0ca372151444ea05eb5f8e93)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ad1ba3604c2054a6d7eb22ff26f3f4a8857683d0
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Aug 23 16:41:57 2019 +0000

    Bug 23502: Staff client "revert status" buttons should not depend on SuspendHoldsIntranet preference

    This bug corrects the template logic controlling the display of the
    "Revert waiting status" and "Revert transit status" buttons on the staff
    client holds page so that it doesn't depend on having
    SuspendHoldsIntranet enabled.

    To test, apply the patch and locate a title which has multiple holds,
    including:

      - One waiting hold
      - One in-transit hold
      - At least one pending hold

    View the page with the SuspendHoldsIntranet preference both on and off.
    The "Revert transit status" and "Revert waiting status" buttons should
    be displayed either way.

    Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 424cd4ed7f877d8bc7a45c77df0fa1b614efd1b7)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 8458626205fececfb1486cbb42b57f6e0c1af8e3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 6 09:09:18 2019 -0500

    Bug 23265: (bug 12063 follow-up) Remove Koha::Holds from updatedatabase

    Test plan:
    Have a DB that fail the 16.12.00.032 update, then apply this patch and
    verify the expiration dates

    RM: Please inforce this rule, no use of Koha:: in updatedatabase!

    Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 18d8d3b38b367ee0ea10169a0433e4a273252f15)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 acqui/ordered.pl                                   |    4 ++--
 acqui/spent.pl                                     |    4 ++--
 admin/aqbudgets.pl                                 |    2 ++
 installer/data/mysql/updatedatabase.pl             |   24 +++++++++++++-------
 .../prog/en/includes/blocking_errors.inc           |    2 ++
 .../prog/en/includes/budgets-admin-toolbar.inc     |    5 +++-
 .../intranet-tmpl/prog/en/includes/holds_table.inc |   19 ++++++++--------
 .../intranet-tmpl/prog/en/includes/js_includes.inc |    6 ++++-
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |    7 ++++--
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |    7 ++++--
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt |    2 +-
 11 files changed, 54 insertions(+), 28 deletions(-)

hooks/post-receive
-- 
main Koha release repository