[koha-commits] main Koha release repository branch master updated. v17.05.00-1088-gfbcf911
Git repo owner
gitmaster at git.koha-community.org
Sun Nov 26 17:25:54 CET 2017
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, master has been updated
via fbcf911f0b8ade40d5189542e4180ceac4d1d109 (commit)
via b780a14ad9fef316df51680be7c1d9d066959e31 (commit)
via ec0ff69182d253b37ae15815d0adeb81f51d1bd1 (commit)
via 2c69ff0b0dfb89480212703e82b06d6877d86c99 (commit)
via 5153d38f489e7b6d135b74b75b63e161e5917aa5 (commit)
via 00adeb397ff6fb9f01dd68a42d7ed136b7afef55 (commit)
via 996298340fb7c545559864593d9054369ba2e56d (commit)
via c42053021bf6f0d5550df5786c8017b90f634ebd (commit)
via 490ec51af6d5df6f62fb004655ae6e6f45abdfee (commit)
via 7c78e4c97e258c829d09e2d48081efc065619651 (commit)
via 4ebb0bbb180f54f216dc90d522223de21a0d227e (commit)
via eed1c91c8f4ca6a836d31f081d4d91289cc27fa2 (commit)
via a081ed16c0c3295253408f999354e6bbfa5fe183 (commit)
via 26be355fe8c83a187a0cfbdae4f3a9e3b9ba8be9 (commit)
via 2fe0a816fe64361a07ad8e4dc09f942ec2428666 (commit)
via 6a4b36bc3a186adb07679c2a3549e69974e02c18 (commit)
via 9cd9240c362336e390eed01acf3630f33e73825f (commit)
via 8d7dd0c69d82d0b53b352a1f8b5450402993ed41 (commit)
via eba47394d14fb96c7c715d5c9ba63d79668652d5 (commit)
via 9c7356aab4b6c8acdcdc22ef449c5cc7d9482a71 (commit)
from d149f1963e3f23f2fc880fa839dadc488428e52a (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 fbcf911f0b8ade40d5189542e4180ceac4d1d109
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Oct 27 11:38:31 2017 +0200
Bug 19536: Odd number of elements in anonymous hash in svc/bib
Resolve:
Odd number of elements in anonymous hash at svc/bib line 69.
Odd number of elements in anonymous hash at svc/bib line 118.
You can see such warnings when testing the Rancor editor.
Replacing url_param by param in fetch_bib since it is a GET call.
Not sure about doing the same in update_bib since that is a POST.
The scalar context will resolve the odd number warns.
Adding a scalar in svc/new_bib too.
Test plan:
Try URL /cgi-bin/koha/svc/bib/[number] with and without the patch.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b780a14ad9fef316df51680be7c1d9d066959e31
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 2 13:22:31 2017 -0300
Bug 18357: Handle unlimited on-site checkouts
If on-site checkouts are set to unlimited (i.e. NULL/undef), they are
currently blocked.
Test plan:
1/ Set All/All rule with Unlimited/unlimited for normal/onsite checkouts
2/ Will be able to perform onsite checkout
3/ Edit rule to be 15/Unlimited normal/onsite
4/ Will be able to perform onsite checkout
=> Without this patch it was blocked
5/ Set rule to 15/15
6/ Onsite checkouts work again
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ec0ff69182d253b37ae15815d0adeb81f51d1bd1
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Nov 13 13:43:05 2017 +0000
Bug 18712: (QA follow-up) Add count of tests
Before patches we did 47 tests or none, we should plan the same number
of tests now
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2c69ff0b0dfb89480212703e82b06d6877d86c99
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 2 10:26:08 2017 -0300
Bug 18712: Remove unecessary fixtures
2 fixtures are in a subroutine that is never called, it can be removed
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5153d38f489e7b6d135b74b75b63e161e5917aa5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 2 10:13:46 2017 -0300
Bug 18712: Fix t/Matcher.t if DB is empty
t/Matcher.t is failing with an empty DB, the data are not mocked
correctly
Test plan:
drop your DB and recreate it without any data and prove t/Matcher.t
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 00adeb397ff6fb9f01dd68a42d7ed136b7afef55
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Nov 17 09:23:40 2017 +0100
Bug 19626: (QA follow-up) Small optimization
We are only using $calendar when the pref is set.
Date calculation can be moved in if-else structure.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 996298340fb7c545559864593d9054369ba2e56d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 15 13:03:57 2017 +0000
Bug 19626: Calculate expiration date for existing holds based on waitingdate
To test:
1 - Have/create a 16.11 instance with some waiting holds
2 - Those holds should not have an expirationdate
3 - Make sure some of the holds are waiting longer than
ReservesMaxPickupDelay
BACKUP THE DB
4 - Upgrade to 17.05 (or later)
5 - Check the expirationdate for the holds
6 - The date wil be in the future (curdate + delay)
7 - Restore DB
8 - Apply patch
9 - Run the upgrade again
10 - expirationdate should now be based on waitingdate
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c42053021bf6f0d5550df5786c8017b90f634ebd
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 8 17:55:00 2017 +0000
Bug 19596: Don't try to get hold or items count for non-existent biblios
Patch applies and works as expected.
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 490ec51af6d5df6f62fb004655ae6e6f45abdfee
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 18 10:29:24 2017 +0000
Bug 19481: Set default sort options as sortable in ES default mappings
To test:
1 - Setup Koha with ES
2 - perform a search
3 - try sorting by pubdate, acqdate, popularity, or title
4 - Search fails!
5 - Apply patch
6 - visit:
/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1
7 - Re-index ES
8 - Perform search
9 - All sorting options should work
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7c78e4c97e258c829d09e2d48081efc065619651
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 1 16:13:23 2017 +0000
Bug 18131: Followup - Use data if biblionumber_tag < 10
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4ebb0bbb180f54f216dc90d522223de21a0d227e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 23 14:44:54 2017 -0300
Bug 18131: ES - Fix matching staged records - Authority
Occurrences of C4::AuthoritiesMarc::SearchAuthorities must be replaced
by search_auth_compat.
You need to define the search index of matching rule with one of the
values defined in %koha_to_index_name (from
Koha::SearchEngine::Elasticsearch::QueryBuilder::build_authorities_query_compat)
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit eed1c91c8f4ca6a836d31f081d4d91289cc27fa2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 27 14:20:48 2017 +0100
Bug 18131: ES - Fix matching staged records
The code in C4::Matches::get_matches is terrible and a bug has been introduced
by bug 12478 because of its way to handle uniqueness.
If search engine is elastic, simple_search_compat returns array ref of MARC::Record,
used as a string for the key of the matches hashref we get things like
"MARC::Record=HASH(0x8f76ab0)".
Yes, terrible...
The file is never staged and we get an internal server error:
stage-marc-import.pl: Can't locate object method "fields" via package "MARC::Record=HASH(0x8f76ab0)" (perhaps you forgot to load "MARC::Record=HASH(0x8f76ab0)"?) at /home/vagrant/kohaclone/C4/Biblio.pm line 2691
To recreate the issue:
- Set SearchEngine == Elastic
- Create a matching rule on 999$c (you need to edit the existing one and specify
'Local-number' as search index, not 'local-number')
- Import a file with bibliographic records and use the matching rule you defined.
Test plan:
Import authority and bibliographic records with Zebra and Elastic using a matching rule.
Everything should work correctly.
Note: I found a bug when importing authorities using Elastic, see bug 17255 comment 38.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a081ed16c0c3295253408f999354e6bbfa5fe183
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 1 15:47:39 2017 +0000
Bug 19559: Add '-' to list of characters we don't split search terms on
Test plan assumes
QueryAutoTruncate = automatically
SearchEngine = Elasticsearch
To test:
0 - Apply Unit test patch only
1 - prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
2 - Should fail
3 - Apply this patch
4 - prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
5 - should pass
6 - search for 'Local-number:"4"' (or a vlid biblionumber)
7 - should get expected result
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 26be355fe8c83a187a0cfbdae4f3a9e3b9ba8be9
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 1 15:46:59 2017 +0000
Bug 19559: Add tests
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2fe0a816fe64361a07ad8e4dc09f942ec2428666
Author: Stefan Berndtsson <stefan.berndtsson at ub.gu.se>
Date: Thu Nov 23 14:43:18 2017 +0100
Bug 19651: SIP/ILS/Item misses title and author
Signed-off-by: Benjamin Rokseth <bensinober at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended $item->biblio by $biblio.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6a4b36bc3a186adb07679c2a3549e69974e02c18
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Nov 26 12:55:27 2017 -0300
Bug 19655: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9cd9240c362336e390eed01acf3630f33e73825f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Nov 20 11:05:35 2017 -0500
Bug 19655: Make To.json escape doesn't escape newlines to create valid JSON
JSON does not allow real line-breaks. If a field contains them and they are not escaped, a JSON parser will be unable to convert the stringified JSON back into an object.
This is clearly exemplified by the guarantor search, where a multi-line note on the guarantor's record will break the ability to select that guarantor.
Test Plan:
1) Create Patron A with a "Circulation note" that has multiple lines in it
2) Create Patron B
3) Attempt to set Patron A to be the guarantor for Patron B
4) Note selecting the patron does nothing
5) Apply this patch
6) Repeat step 3
7) Selecting the guarantor now works!
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8d7dd0c69d82d0b53b352a1f8b5450402993ed41
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Nov 13 15:34:53 2017 +0000
Bug 18547: (QA follow-up) Add comments to make tests clearer
Tests had some confusion with names and results, though they do seem to
cover the changes here.
I believe the tests highlight that ReserveControlBranch has no effect,
and possibly it should? Beyond the scope here but left those tests
for future work to be done
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit eba47394d14fb96c7c715d5c9ba63d79668652d5
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Wed May 3 21:13:49 2017 +0200
Bug 18547: On shelf holds allowed > "If all unavailable" ignores default hold policy
If in the circ rules matrix you set "On shelf holds allowed" to "If all unavailable",
default hold policy "From home library" is ignored.
Test plan:
- Have a test user from one branch (eg Centerville)
- Set "On shelf holds allowed" to "If all unavailable" for your patron and item
category (or everyone and everything)
- For "Default checkout, hold and return policy", set hold policy to "From home library"
-> make sure there is no "Default holds policy by item type" to override the setting
- Have two items for a record.
1. An item with home branch same as test user (eg Centerville)
-> check this item out to somebody else
2. an item with a different home branch (eg Fairfield)
-> available, not checked out
- Try to place a hold for your test user. Does not work.
- Apply the patch
- Try to place a hold. Should work now.
Followed test plan, worked as intended
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Followed test plan in the intranet and OPAC, worked as intended.
With few assumptions made:
- when the hold works, should be on the item 1 (Centerville)
item 2 is only there to trigger the bug
- the circ rules were identically setup on each branch and in "Standard rules for all libraries"
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9c7356aab4b6c8acdcdc22ef449c5cc7d9482a71
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 31 15:34:20 2017 -0300
Bug 18547: Add tests
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 4 +-
C4/Matcher.pm | 92 ++++++++++-------
C4/Reserves.pm | 7 +-
C4/SIP/ILS/Item.pm | 2 +
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 2 +-
Koha/Template/Plugin/To.pm | 2 +
acqui/parcel.pl | 6 +-
admin/searchengine/elasticsearch/mappings.yaml | 22 ++---
installer/data/mysql/updatedatabase.pl | 10 +-
svc/bib | 4 +-
svc/new_bib | 2 +-
t/Biblio.t | 23 +----
t/Calendar.t | 10 --
t/Matcher.t | 10 +-
t/db_dependent/Circulation/TooMany.t | 55 ++++++++++-
.../Holds/DisallowHoldIfItemsAvailable.t | 103 +++++++++++++++++++-
.../Koha_SearchEngine_Elasticsearch_Search.t | 16 ++-
.../{Koha/Subscription.t => Template/Plugin/To.t} | 33 ++++---
18 files changed, 288 insertions(+), 115 deletions(-)
copy t/db_dependent/{Koha/Subscription.t => Template/Plugin/To.t} (61%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list