[koha-commits] main Koha release repository branch 19.11.x updated. v19.11.00-6-gc5336e2
Git repo owner
gitmaster at git.koha-community.org
Tue Dec 10 21:19:20 CET 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.11.x has been updated
via c5336e24eb24c0faa7d28faa96bd40b13ccf834c (commit)
via 98b3ae9f41f40a1230dbcc184404efda2d25980e (commit)
via 9b0ad66e029ca0ebf0b89bdf6a1a9585dfe610ee (commit)
via 678b4bf4642852aba0d11af0ba826164ffdfd012 (commit)
from 9cade9186d6234e3ed816e5ab8c32b1060e03341 (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 c5336e24eb24c0faa7d28faa96bd40b13ccf834c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 4 16:04:45 2019 +0100
Bug 24168: (bug 23116 follow-up) AllowHoldPolicyOverride allows a librarian to almost place a hold on an item already on hold
This patch actually fixes the issue described on bug 23116.
Test plan:
See bug 23116 and comment 5. Important to note that the later comparison with
itemAlreadyOnHold assumes that the variable is a string.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 98b3ae9f41f40a1230dbcc184404efda2d25980e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Nov 29 10:49:37 2019 +0000
Bug 24136: Update sponsors for 19.11 cycle
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 9b0ad66e029ca0ebf0b89bdf6a1a9585dfe610ee
Author: Lisette Scheer <lisetteslatah at gmail.com>
Date: Tue Nov 19 17:50:45 2019 +0000
Bug 24053: Typo in FinePaymentAutoPopup description
There is a typo in the FinePaymentAutoPopup system preference description.
This patch fixes that.
To test:
1) Go to the systems preferences in administration.
2) Search for FinePaymentAutoPopup
3) Observe .. at the end of the preference description.
4) Apply the patch
5) Repeat steaps 1-2
6) Ovserve correct punctuation at the end of the preference description.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 678b4bf4642852aba0d11af0ba826164ffdfd012
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 2 17:50:40 2019 +0100
Bug 24145: (bug 22543 follow-up) Fix Auth.t
Auth.t is failing because of: 1. recent changes from bug 22543 and 2. wrong mocked CGI->param in tests
Without this patch we hit the exit statement that breaks the tests with the following error:
t/db_dependent/Auth.t .. 1/22 Un-mocked method 'url()' called at /kohadevbox/koha/C4/Auth.pm line 1223.
Un-mocked method 'redirect()' called at /kohadevbox/koha/C4/Auth.pm line 1227.
A context appears to have been destroyed without first calling release().
Based on $@ it does not look like an exception was thrown (this is not always
a reliable test)
This is a problem because the global error variables ($!, $@, and $?) will
not be restored. In addition some release callbacks will not work properly from
inside a DESTROY method.
Here are the context creation details, just in case a tool forgot to call
release():
File: t/db_dependent/Auth.t
Line: 74
Tool: Test::More::subtest
Cleaning up the CONTEXT stack...
# Looks like you planned 22 tests but ran 1.
t/db_dependent/Auth.t .. Dubious, test returned 255 (wstat 65280, 0xff00)
Failed 21/22 subtests
Test Summary Report
-------------------
t/db_dependent/Auth.t (Wstat: 65280 Tests: 1 Failed: 0)
Non-zero exit status: 255
Parse errors: Bad plan. You planned 22 tests but ran 1.
Files=1, Tests=1, 2 wallclock secs ( 0.02 usr 0.00 sys + 1.54 cusr 0.24 csys = 1.80 CPU)
Result: FAIL
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 20 ++++++++++++++++++--
.../en/modules/admin/preferences/accounting.pref | 2 +-
reserve/request.pl | 6 +++---
t/db_dependent/Auth.t | 10 ++++++++--
4 files changed, 30 insertions(+), 8 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list