[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.06-24-gcd420d1
Git repo owner
gitmaster at git.koha-community.org
Thu Jun 7 10:11:09 CEST 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 cd420d1165c72869875236de16e515f4592eeb99 (commit)
via 4d441f38bb3a725fc4a19b344c74319e89e314a2 (commit)
via 1bc4a4b78f0661f7ed66cae64f3a7f721d08df92 (commit)
via 3b63cab416212eab8ea023c196f282e683d56d64 (commit)
via cbeed6cf3db342e025b4d837ab135136d39a140e (commit)
via d65b20c673eda825d7cb24425abdf43007cfd570 (commit)
via 7a6d958bf3cec338adf239a7e69dd6168ab1cdfb (commit)
via 3083e0f29462868caf97c841eb73ce3d8ca361ad (commit)
via 7f120b8a2b9f57891759e515c31a85a4f3f979fd (commit)
via 3f3ba9caf06ab8ca5dfa32551d9a84e52ba68f5d (commit)
via 4a1db4935500f465eddef9199a31b5ef158fdb89 (commit)
via 232dcacb692d6c2e917767eaa9daab7d139ccf13 (commit)
via 140d171e651280d1b4a259d50db3c47d417739d9 (commit)
via b6da7967f3b28c32b736b148210e5d5af1ec8a9b (commit)
via e1e52c54936f4354584e465dcbd3acbe27effeb7 (commit)
from 4cc1972a2c992299609b62d8497c0b23e50aac86 (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 cd420d1165c72869875236de16e515f4592eeb99
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 30 13:07:39 2018 +0000
Bug 17561: (follow-up) Pass itemnumber on returns and correct itemnumber param in circulation
To test:
1 - Place two holds on a bib for a single patron
2 - Check in both items, confirm the screen message and slip are correct
3 - Checkout both items to another patron, confirm the screen message
and slip are correct
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 183e10c13f6366b29dd79a7a9549f7d105d73f73)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4d441f38bb3a725fc4a19b344c74319e89e314a2
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Fri May 18 08:00:03 2018 -0400
Bug 17561: (QA follow-up) Update existing unit tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 9c4040f37d705f2705fafc7a338695ddd76c1999)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 1bc4a4b78f0661f7ed66cae64f3a7f721d08df92
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Fri May 18 07:20:06 2018 -0400
Bug 17561: (QA follow-up) Simplify new ReserveSlip code
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit a088aad171fda8deefca517517d35bee851f7ffc)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3b63cab416212eab8ea023c196f282e683d56d64
Author: Benjamin Rokseth <benjamin.rokseth at deichman.no>
Date: Thu Mar 15 12:57:37 2018 +0100
Bug 17561: ReserveSlip needs itemnumber for item level holds on same biblio
This patch fixes a regression after bug 14695.
This patch adds itemnumber and barcode as optional params in ReserveSlip used
by hold-transfer-slip.pl to generate HOLD_SLIP. This is for ReserveSlip to be
able to generate correct slips when items in multi-item holds are checked in.
Test plan:
1) activate a circulation rule with multi-item holds
2) Place two holds on same biblio for patron
3) for debugging, either use browser console to observe POST request and responses
or use info from reserves, e.g. reserve_id in the HOLD_SLIP
4) checkin two items from same biblio on pickup branch
5) note that both holds are effectuated, but reserve_id is the same on both slips
6) also note that there is no itemnumber or barcode in the requests from returns.pl
7) Apply this patch
8) repeat 2-4
9) note that reserve_id is now different on the two slips
and/or:
Run tests:
t/db_dependent/Reserves/ReserveSlip.t
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Maksim Sen <maksim.sen at inlibro.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit a2b9db00cf468b1712263879f6afeddb3553bf61)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit cbeed6cf3db342e025b4d837ab135136d39a140e
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Jun 3 10:09:23 2018 +0200
Bug 20861: Correct EDI permissions on EDI messsages
The permission for EDI is edi_manage, but 2 pages asked
for manage_edi, allowing users not to access those.
To test:
- Add edi_manage to your permissions
- Try to access the EDIFACT messages from the
acq start page
- Verify it doesn't work
- Apply patch and try again
- You should be able to access the page now
- Try to access the other page directly (if you don't
have EDI data):
/cgi-bin/koha/acqui/edimsg.pl
- Verify you can access the page and don't get a
permission error
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 7883b19de5f24551b36bf29133b04bc71ad4d56a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d65b20c673eda825d7cb24425abdf43007cfd570
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 28 16:36:54 2018 -0300
Bug 20763: Remove unecessary Koha::Patron fetch
If $borrowernumber is not set, there is no userenv.
So let's pick the library code set in the userenv instead of fetching
the Koha::Patron->branchcode from DB
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.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 7e025fde1ae976cb12d4593b33579e12f5b284ec)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 7a6d958bf3cec338adf239a7e69dd6168ab1cdfb
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Mon May 14 08:45:00 2018 -0400
Bug 20763: AllowPurchaseSuggestionBranchChoice triggers error opac-suggestions.pl is visited without logging in
Some code executed in the script opac-suggestions.pl if the system preference AllowPurchaseSuggestionBranchChoice is enabled assumes there is a logged in user. If there is not, patrons will see the error "Internal Server Error".
Test Plan:
1) Enable AllowPurchaseSuggestionBranchChoice
2) Enable AnonSuggestions
3) In the OPAC, perform a search that will have no results,
click the "Make a purchase suggestion" link.
4) Note the error
5) Apply this patch
6) Reload the page
7) The page should load now!
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e3cc49a61b13ff863262da6a397eb49a3045b14a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3083e0f29462868caf97c841eb73ce3d8ca361ad
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Mon May 21 14:56:58 2018 -0400
Bug 20798: Client side validation for for fund selection prevents adding only some records to a basket
Bug 19453 "fixed" the fund validation that never actually worked. This validation should be removed altogether instead. It is overly simplistic and simply checks to see if each record in the batch has a fund selected regardless of whether that record will be imported or not.
In addition, the code completely ignores items generated by MarcItemFieldsToOrder such that even if items on that page have a fund selected, the javascript forces the librarian to make a selection from the left-hand fund pulldown even though it will not be used.
Considering this bad validation is basically 'new' as it never worked before, the most sensible course of action would be to 'undo' the change and remove the validation.
Test Plan:
1) Add records to a basket from an import batch
2) Select only some of those items in the batch
3) Note Koha will not let you import them unless you set funds for *all*
records in the batch
4) Apply this patch
5) Note Koha no longer forces a budget to be selected in the pulldown
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
https://bugs.koha-community.org/show_bug.cgi?id=20789
Signed-off-by: Chris Cormack <chrisc 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 c5dc6aeae728078ca76e88f8af8693772006d842)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 7f120b8a2b9f57891759e515c31a85a4f3f979fd
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 2 16:13:20 2018 +0200
Bug 20696: Fix a few ugly "eq undef" comparisons in Search.pm
Comparisons like $a eq undef should normally raise a warning like:
Use of uninitialized value in string eq at ...
But unfortunately we still suppress warnings here and there.
Test plan:
[1] Just read this patch and confirm the small changes.
[2] Git grep on "eq undef" and do not find other occurrences.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Passes test plan and QA tools. Searching works correctly.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.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 66f5b793ed8e52372466122263cac0ddd84dea63)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3f3ba9caf06ab8ca5dfa32551d9a84e52ba68f5d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri May 18 14:01:09 2018 +0000
Bug 20781: Set a minimum enrollemnt period 'in months' of 1
To test:
1 - Browse to Admin->Patron Categories
2 - Click '+ New category'
3 - Enter data as required, however, enter 0 in 'Enrolment period' ->
'in months'
4 - Save
5 - View the list of categories, the new category has 'Enrolment period'
= 'until'
6 - Create a patron in this category, note their dateexipry is
'0000-00-00'
7 - Search for them
8 - internal server error
9 - Delete that patron
10 - Apply patch
11 - Edit the category, note you cannot save with 0 months
12 - Set 1 month and save
13 - Create a patron in this cateogry
14 - Note they have a valid dateexpiry
15 - Search for them
16 - All works
17 - Create a new category and verify you cannot add with 0 months
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 59989e7be4e4c697b0ef316eab53b6450f5edb58)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4a1db4935500f465eddef9199a31b5ef158fdb89
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Apr 5 10:06:37 2018 -0300
Bug 20191: (QA follow-up) Require Jessie's Test::MockTime
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit aaea46594215c88b4459cd882f1d869faeb2e2d8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 232dcacb692d6c2e917767eaa9daab7d139ccf13
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Apr 5 01:31:38 2018 +0000
Bug 20191: Use Test::MockTime to hold time still
The problem is the calls to HTTP::OAI::Header, etc.
may reference gmtime which is continually changing by
the second. By forcing time to lock for all the tests,
except the last one, we can be assured things should
not fail.
TEST PLAN
---------
install libtest-mocktime-perl
apply the patch
restart_all
in kshell, prove t/db_dependent/OAI/Server.t
run koha qa test tools
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit b76ad51b9d45d67746bddf27a9376e810c1b2d1e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 140d171e651280d1b4a259d50db3c47d417739d9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 16 12:12:00 2018 -0300
Bug 20191: Use find with unique key combination
To prevent unexpected issues later.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 04005f2ea12c270f2895738eb434e5292218b789)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b6da7967f3b28c32b736b148210e5d5af1ec8a9b
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Feb 15 14:14:18 2018 -0300
Bug 20191: Make OAI/Server.t tests use timestamps from the DB
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 2f90cd2be0affbdd2e2bc0c2223bfcf0cf65a13a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit e1e52c54936f4354584e465dcbd3acbe27effeb7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 14 14:04:01 2018 -0300
Bug 20767: Display a stack trace when a method is not covered by tests
When a method is not allowed yet (not covered by tests), developers get
an error the is not really useful: "The method XXX is not covered by
tests!"
It would be more useful to have a stack trace in order to know where
this error come from.
Test plan:
Modify some code to display this stack trace and confirm it makes sense
to have it, i.e. it will make debug easier
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit b9dffc169ddb7a3a32a071c4a004420814fa3a3f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer/PerlDependencies.pm | 5 +
C4/Reserves.pm | 45 +++++-
C4/Search.pm | 7 +-
Koha/Object.pm | 6 +-
Koha/Objects.pm | 10 +-
acqui/edifactmsgs.pl | 2 +-
acqui/edimsg.pl | 2 +-
circ/hold-transfer-slip.pl | 12 +-
circ/returns.pl | 1 +
koha-tmpl/intranet-tmpl/prog/en/js/categories.js | 3 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 13 --
.../prog/en/modules/circ/circulation.tt | 4 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +-
opac/opac-suggestions.pl | 15 +-
t/db_dependent/Koha/Objects.t | 27 +++-
t/db_dependent/Letters/TemplateToolkit.t | 8 +-
t/db_dependent/OAI/Server.t | 29 +++-
t/db_dependent/Reserves.t | 2 +-
t/db_dependent/Reserves/ReserveSlip.t | 165 ++++++++++++++++++++
19 files changed, 297 insertions(+), 61 deletions(-)
create mode 100644 t/db_dependent/Reserves/ReserveSlip.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list