[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-71-gd08b85cb89

Mon Jul 27 20:16:03 CEST 2020

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, 20.05.x has been updated
       via  d08b85cb89ffd1333156615408f320d78fed1251 (commit)
       via  9b51c5eb98e8d1130322fbb71a1aefdbb58119ed (commit)
       via  221403e3a0ce329342ad5fb2f5b9a6c5b7ecf7a7 (commit)
       via  882d7a07b9b514801ec7dc335c86360e4a6cdbb6 (commit)
       via  210c246867a8b451931e7c4c2429d808c740c0d4 (commit)
       via  8cf7e47b2cd1341435f53db43dfc4bfcd957c558 (commit)
       via  955a5d77d0793cfbad950ac917beda5a2a9afe84 (commit)
       via  384df874d8e7e55165bd7e280b8e1c956977ee7b (commit)
       via  9a60e3934dae4f29cdfa6b6874b0a611db34b2dc (commit)
       via  30e01203284cc0f76e860644b3032799ccea2f2e (commit)
      from  5d25e77f8c4543d6b50f3f867efc4510f4b20667 (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 d08b85cb89ffd1333156615408f320d78fed1251
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date:   Fri Jul 17 14:26:15 2020 +0000

    Bug 25723: (QA follow-up) Remove unused module import

    The last usage of this module was removed in the commit
    "Bug 25723: Update cache flushing calls" but the import was
    not removed along with it.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e8fe7de5be946735b59fdc5cd8e8c6b166ed2475)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 9b51c5eb98e8d1130322fbb71a1aefdbb58119ed
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 17 12:34:18 2020 +0000

    Bug 25723: (QA follow-up) Handle holiday and exception on same day

    When a holiday is entered, then exceptions generated on a range, there exists both a holiday and exception in
    the special holidays table. We should cache the exception over the holiday instead of both

    Also, !1 in perl returns '' rather than 0, so we should explicitly set the value

    Add blank line to clear pod error from qa tools

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Re-introduce the blank line mentioned in the commit message, it was accidentally removed by automatic formatting
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 223b603f08267f801860bf5deaaa1884e58eab1e)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 221403e3a0ce329342ad5fb2f5b9a6c5b7ecf7a7
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Wed Jun 17 14:04:14 2020 +0100

    Bug 25723: (QA follow-up) Silent POD warning

    I didn't introduce the method that is warned about, but adding POD for
    it seemed reasonable and will silence the QA Script warning.

    Signed-off-by: Emma Perks <Emma.Perks2 at uhb.nhs.uk>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 5851539424d04eda0da52ef8744925227dd6ce0f)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 882d7a07b9b514801ec7dc335c86360e4a6cdbb6
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Wed Jun 17 13:46:34 2020 +0100

    Bug 25723: Remove tests for removed method

    We removed the exception_holidays (and single_holidays) methods as part
    of this patchset. As such, we should no longer test them ;)

    Signed-off-by: Emma Perks <Emma.Perks2 at uhb.nhs.uk>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 25f0d425eaa7c66953d02c5a5717b1b2abcb89a6)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 210c246867a8b451931e7c4c2429d808c740c0d4
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Wed Jun 17 13:18:24 2020 +0100

    Bug 25723: Update cache flushing calls

    This patch updates the previous single_holidays and exeption_holidays
    cache flushing calls to match the new cache key structure of the updated
    routines.

    Signed-off-by: Emma Perks <Emma.Perks2 at uhb.nhs.uk>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 61141c28b0fcbbb021371bb4c2dd8e818aec0691)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 8cf7e47b2cd1341435f53db43dfc4bfcd957c558
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Wed Jun 17 11:14:30 2020 +0100

    Bug 25723: Use the same code for single and exception holidays

    This patch refactors is_exception_holiday and is_single_holiday to
    utilise a single _holidays method which combines the logic of the
    previous single_holidays and exception_holidays methods.

    As Koha::Calendar is instantiated at a branch level, we also move split
    the cache into branches too.

    Signed-off-by: Emma Perks <Emma.Perks2 at uhb.nhs.uk>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ae0b2befe8c9086df24469cb546c7c5f8d98de95)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 955a5d77d0793cfbad950ac917beda5a2a9afe84
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Jun 12 16:30:28 2020 +0100

    Bug 25723: Use a hasref for lookup

    Rather than using an array of dates and iterating them, use a hashref
    and do a direct lookup

    Signed-off-by: Emma Perks <Emma.Perks2 at uhb.nhs.uk>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e1dfe50522a01a7640fcca6e2a015206939579c9)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 384df874d8e7e55165bd7e280b8e1c956977ee7b
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Jun 12 16:02:26 2020 +0100

    Bug 25723: Drop DateTime::Set from cpanfile

    Signed-off-by: Emma Perks <Emma.Perks2 at uhb.nhs.uk>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit cd862763c9654ded15c1a7d79fafb2ec73e4f20e)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 9a60e3934dae4f29cdfa6b6874b0a611db34b2dc
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Jun 12 15:11:52 2020 +0100

    Bug 25723: (follow-up) Fix Unit Test

    The unit test previously relied on the internals of exception_holidays.

    Signed-off-by: Emma Perks <Emma.Perks2 at uhb.nhs.uk>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 5b2990d270fdde9fd7f69f6402db9ee171b6473e)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 30e01203284cc0f76e860644b3032799ccea2f2e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Jun 12 11:53:49 2020 +0100

    Bug 25723: Drop DateTime::Set dependancy

    This patch removes our use of DateTime::Set and replaces it with a quick
    hashref implimentation

    Signed-off-by: Emma Perks <Emma.Perks2 at uhb.nhs.uk>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0f0553da225052ff5b8b9bca7a386e04472f32da)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 C4/Calendar.pm                           |  29 +++----
 Koha/Calendar.pm                         | 134 ++++++++++---------------------
 cpanfile                                 |   1 -
 t/Calendar.t                             |  19 +++--
 t/db_dependent/Circulation.t             |  12 ++-
 t/db_dependent/Circulation/CalcDateDue.t |   8 +-
 t/db_dependent/Holidays.t                |  47 +----------
 tools/newHolidays.pl                     |   5 --
 8 files changed, 88 insertions(+), 167 deletions(-)

hooks/post-receive
-- 
main Koha release repository