[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.11-46-g42af3be

Mon Nov 26 07:57:32 CET 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, 17.11.x has been updated
       via  42af3bef9f82169f08cc6dcc5e1c27623f694f2e (commit)
       via  dffd83aae09dbda89f979d3e7f9c77cf2e01bd82 (commit)
       via  7a7531e21964992c20ca0c5a6e75b4c3a7a53178 (commit)
       via  57511ebc15068112b41163a8708d058a8af42985 (commit)
       via  c18f11ff30288764181d2dc34a0d965516faa6c2 (commit)
       via  3ccb7d2da68315bf6eadd11df7536f3eb0b79779 (commit)
       via  e9e5e55e84624b36f317940eabb816d48612743d (commit)
       via  5bffc862f3a59654a9ba6034de57108f08625c7b (commit)
      from  60bbe45f6decdf21cecdb85088a178a2b5f0724b (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 42af3bef9f82169f08cc6dcc5e1c27623f694f2e
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Thu Oct 25 14:17:59 2018 +0100

    Bug 21641: (follow-up) Address wrong call method

    This patch substitutes C4::Accounts->getnextacctno for
    C4::Accounts::getnextacctno since getnextacctno is only expecting to be
    passed a borrowernumber

    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 4858c4f736d366701fa6a3f1def2727dd85c70ce)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit ff2de8e181e864cd121e39e314fe6be4dbe8eb0b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit dffd83aae09dbda89f979d3e7f9c77cf2e01bd82
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Thu Oct 25 13:23:31 2018 +0100

    Bug 21641: (follow-up) Address additional call

    This patch makes the same change as the main patch, just for an
    additional occurance of getnextacctno

    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 6fba062d291e065b4a6d7ffebdf82db9d6935971)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit e79fac32c8ca7ef01b516feea461a07c7e8e3570)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 7a7531e21964992c20ca0c5a6e75b4c3a7a53178
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Wed Oct 24 03:37:57 2018 +0000

    Bug 21641: Added C4::Accounts to getnextacctno() call

    Test plan:
    1. Fetch and checkout the master branch
    2. Checkout an item with a rental charge associated with it to a user
    and notice an error is thrown
    3. Apply patch
    4. Restart memcached and plack
    5. Repeat steps 1 and 2 and notice the checkout happens successfully

    Sponsored-By: Catalyst IT

    Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 344dba2fb84a743603c1c51294be4e378e6e5dc7)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 5c62543310c94b179dd3c8c93f4f79a414be5980)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 57511ebc15068112b41163a8708d058a8af42985
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Oct 23 12:30:25 2018 +0000

    Bug 21476: Fix HTML5 media from playing in the OPAC - incorrect filters

    This patch makes a correction to a template filter to prevent
    incorrectly-encoded HTML in media source links which were preventing
    media from embedding correctly in the OPAC.

    To test, apply the patch and enable the HTML5MediaEnabled and
    HTML5MediaYouTube system preferences.

    - Edit a record to include links to videos in 856$u. For example:
      - https://www.youtube.com/watch?v=grTwH6Evdfc
        - https://archive.org/download/POPEYEMeetsSindbadTheSailor1936/POPEYE%20meets%20Sindbad%20The%20Sailor%20%281936%29.ogv

        View the record in the OPAC and confirm that the videos display in
        the
        "Play media" tab and that they play correctly.

    Tested and works as described, also matches the intranet code.

    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 7736b5c2e32975502fa6198b5f7ec64feb7b8ffc)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 18bb4d5e66f4bfc74144bce2f730359b55526b08)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c18f11ff30288764181d2dc34a0d965516faa6c2
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Oct 31 12:18:58 2018 +0000

    Bug 21742: Fix YouTube variable propagation

    The loop to find all media has an $isyoutube variable. This was declared
    outside the loop and never reset. Once a YouTube video was encountered
    all subsequent videos were considered as YouTube. This patch reduces the
    scope of the variable and resets per loop.

    To test:
    1 - Enable HTML5Media and HTML5MediaYouTube
    2 - Add 856$u to record for a youtube vido and a pdf (sample record
            attached to bug)
    3 - View the record, the Play media tab has two video boxes
    4 - Play the second, it fails
    5 - Apply patch
    6 - View record, Play media should include only one video link

    Signed-off-by: Devinim <kohadevinim at devinim.com.tr>

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 8ceba54c8dcfd9b598375b8af432c0111ec63d04)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit ec7e569d55575f26ba481684ff157c8ec3985002)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 3ccb7d2da68315bf6eadd11df7536f3eb0b79779
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Oct 25 11:37:42 2018 +0200

    Bug 21311: (follow-up) Adjust wording of failed login message

    Based on the feedback of Jonathan, Katrin, Mark and Martin (thx), adding
    the general remark that if lockout is enabled, an account may be locked
    out after x attempts. This does not say that the account on hand is
    locked or not.

    Adding a <p> tag between 'Log in'-button and 'Forgot your password' for
    presentation.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit e64650216f568e7d7ad26e25ae59493202d871a3)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 14e9eb67b9e86b025eeddc9426c490280a4c022f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e9e5e55e84624b36f317940eabb816d48612743d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Oct 10 16:04:38 2018 +0200

    Bug 21311: Remove locked message from opac-auth.tt

    We should not expose more information than needed when someone tries
    to login with invalid credentials. Saying that an account is locked
    reveals that the account exists (or perhaps an email address).

    Trivial fix. Keeping the var too_many_login_attempts for staff.
    Note: We do not remove this distinction for the staff client here (in the
    assumption that a library may well have additional security measures in
    place for staff client). But it could be done too (on another report).

    Test plan:
    Enable lockout feature.
    Enter invalid credentials until account locks out (on OPAC !!)
    Note that message does no longer change to 'Account is locked'.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 716301d6f5bb149e963c5547d69d4019c20953db)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 55d687f3a7002439c6d27fb35af83333b8dfcdc4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5bffc862f3a59654a9ba6034de57108f08625c7b
Author: Victor Grousset <victor.grousset at biblibre.com>
Date:   Thu Oct 18 11:54:58 2018 +0200

    Bug 21587: don't drop patrons to notify in order creation

    It only worked on modification.

    == Test plan ==
    1. have/create a active budget
    2. have/create a fund
    3. have/create a vendor with minimal info
    4. create a basket with minimal info
    5. add an order line to the basket
         Add a user in "To notify on receiving"
    6. Modify the order
    7. The patrons isn't here. This is the bug
    8. Add a user in "To notify on receiving"
    9. Save
    10. Modify the order
    11. The patron is here now
    12. Apply this patch
    13. Retry step 5 to 11 and patron should be saved on order creation
    14. Celebrate! :D

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

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit bf8b4e773c089a4094b18c62af91711b8af99f82)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit cb7db6fcd45d956d28596d86de312ee5502333a6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Circulation.pm                                      |    4 ++--
 C4/HTML5Media.pm                                       |    2 +-
 acqui/addorder.pl                                      |    7 +++----
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt  |   16 ++++------------
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt      |    8 ++++----
 5 files changed, 14 insertions(+), 23 deletions(-)

hooks/post-receive
-- 
main Koha release repository