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

Git repo owner gitmaster at git.koha-community.org
Fri Nov 9 13:19:20 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  ae754c73e0dabe77157f25c5be3023353773c019 (commit)
       via  9a67ccab56a055e5707b1df353f3b8b7a9fa1a8d (commit)
       via  8835e542c2cff98a53aec38e786adf7e720d86f4 (commit)
       via  e881a161ea2bda054f6f217eb31f749b598079f8 (commit)
      from  22772e1a097d1c51f19ae39c07b2d376ea67bb7f (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 ae754c73e0dabe77157f25c5be3023353773c019
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Oct 16 10:27:37 2018 -0300

    Bug 21155: Prevent SwitchOnSiteCheckouts.t to fail randomly
    
     #   Failed test 'The date_due should have been set depending on the circ
     rules when the on-site checkout has been switched'
     #   at t/db_dependent/Circulation/SwitchOnSiteCheckouts.t line 126.
     #          got: '2018-10-16T23:59:00'
     #     expected: '2018-10-21T23:59:00'
    
    TestBuilder set date to today, so issuingrules.harduedate will be set to
    today.
    issuingrules.hardduedatecompare will be set to an integer.
    If set to 0, $datedue will be reset to the hard due date
    
    The call stack is: AddIssue > CalcDateDue > GetHardDueDate
    
    In GetHardDueDate:
    3509         if ( $hardduedatecompare == 0 || $hardduedatecompare == $cmp ) {
    3510             $datedue = $hardduedate->clone;
    3511         }
    
    To fix this random failure we need to set issuingrules.harduedate to undef.
    
    Test plan:
    0. Do not apply this patch
    1. Modify the test to set hardduedatecompare to 0 (search 'my $issuingrule = ')
    2. Execute the test and confirm the failure
    3. Apply this patch
    4. Execute the test and confirm the it is no longer failing
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 4e6d9defc180204461f80477be287ade7fcfc11b)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit c82207ebb5487660e70c7091195d67be4b434139)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 9a67ccab56a055e5707b1df353f3b8b7a9fa1a8d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Oct 26 12:32:20 2018 +0100

    Bug 21351: Rename the Taiwanese language pack to use correct file name
    
    The words "Han (Simplified variant)" is appearing in the language name
    because the file is titled "zh-Hans-TW" when it should be titled
    "zh-Hant-TW". The database is set up to use "Hant" but it just
    incorrectly named.
    
    Test plan
    1. Apply patch.
    2. Install zh-Hant-TW on your Koha server.
    3. Navagate to I18N/L10N preferences and confirm that the english text description states (Traditional variant).
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Files on translate.kc.org have already been fixed by Bernardo.
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    (cherry picked from commit fd0df2ad55f9a5ff180dc0dfa22fede5f0ad37cd)
    Converted to removal of files rather than rename as translation merges
    had already created the new files as expected.
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 2cae3d86bd64ed39d4963b549583c7f514b3f9ad)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 8835e542c2cff98a53aec38e786adf7e720d86f4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Jul 25 14:37:59 2018 +0200

    Bug 21115: Add multi_param call and add divider in cache key in svc/report and opac counterpart
    
    Resolve things like:
    CGI::param called in list context from package CGI::Compile::ROOT::usr_share_koha_prodclone_opac_svc_report line 42, this can lead to vulnerabilities. See the warning in "Fetching the value or values of a single named parameter" at /usr/share/perl5/CGI.pm line 436.
    
    The cache key in both script looks like:
        opac:report:id:602018
    but should for consistency be:
        opac:report:id:60:2018
    Note: The 2018 here is part of the sql_params and should not be
    concatenated to the report id.
    
    Test plan:
    Do not yet apply this patch.
    Make a report public, set cache to 300 secs.
    Check its output with opac/svc/report.
    Check for the warn in your log.
    Apply the patch, restart Plack and flush cache.
    Check opac/svc/report.
    Modify your report; e.g. add a simple string to the SELECT.
    Check opac/svc/report. You should still see cached output.
    Flush the cache.
    Check opac/svc/report. You should now see the added text.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tested also by clearing individual keys with $cache->clear_from_cache.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit bfbbe52ff7ff0ec93825684e4728db705b4100d1)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 2ea99b19988a3fed348d574cb06a50c8f6206f34)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e881a161ea2bda054f6f217eb31f749b598079f8
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Oct 10 13:43:40 2018 +0200

    Bug 21279: Fix   in transport cost matrix
    
    Test plan:
    On Home › Administration › Transport cost matrix you should no longer
    see " ".
    Fill some values and save, you should see the correct values.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 1fddd295b8e83b60f2b838f09f3175c5acfeec28)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 4092461ec990882f204d1431e69fd6d6a70d0d1e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/modules/admin/transport-cost-matrix.tt |    4 +-
 misc/translator/po/zh-Hans-TW-marc-MARC21.po       |18384 -------
 misc/translator/po/zh-Hans-TW-marc-NORMARC.po      | 2878 -
 misc/translator/po/zh-Hans-TW-marc-UNIMARC.po      |13157 -----
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po    |12437 -----
 misc/translator/po/zh-Hans-TW-pref.po              | 8047 ---
 misc/translator/po/zh-Hans-TW-staff-help.po        |20907 -------
 misc/translator/po/zh-Hans-TW-staff-prog.po        |56908 --------------------
 opac/svc/report                                    |    4 +-
 svc/report                                         |    4 +-
 t/db_dependent/Circulation/SwitchOnSiteCheckouts.t |    2 +
 11 files changed, 8 insertions(+), 132724 deletions(-)
 delete mode 100644 misc/translator/po/zh-Hans-TW-marc-MARC21.po
 delete mode 100644 misc/translator/po/zh-Hans-TW-marc-NORMARC.po
 delete mode 100644 misc/translator/po/zh-Hans-TW-marc-UNIMARC.po
 delete mode 100644 misc/translator/po/zh-Hans-TW-opac-bootstrap.po
 delete mode 100644 misc/translator/po/zh-Hans-TW-pref.po
 delete mode 100644 misc/translator/po/zh-Hans-TW-staff-help.po
 delete mode 100644 misc/translator/po/zh-Hans-TW-staff-prog.po


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list