[koha-commits] main Koha release repository branch master updated. v20.05.00-1040-gd9815855bd
Git repo owner
gitmaster at git.koha-community.org
Mon Sep 28 11:40:21 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, master has been updated
via d9815855bd6e442857fdae0c48335f9fe5d17507 (commit)
via d716f2a18a7863f7b7f2e42fd8286b9982a52775 (commit)
via 36895fee3a5aaea9096f5edfba29b408eb6975db (commit)
via ae21c3adb16c0604c995a08a4082c3d1d60ab822 (commit)
via ff08e99965ccb60092b5bdd5181fd517e1fab161 (commit)
via d19572ea765dbf6c13ba1343433ed07729413248 (commit)
via 501b9ea33667c7fdd87fe356b9fab364c10ab383 (commit)
via 47b594a3dcd59f13073716daf38696967d1faa77 (commit)
via a7dde763dcb4e6f4d9d8a61e754f48758cbd03a4 (commit)
via a690ba2b26ef6247cdf336077311e4afb0e94473 (commit)
via 205d909a56f0170e1abf60bf880315e52f66fd21 (commit)
via 88cb7f223d31716c20e8f9341c64594b28ada33f (commit)
via 6f989338899a3a4fe0cf131f0c63ef79f69a7bf2 (commit)
via 26ab04a3b383f5a9c88124625f8edc1c4cf1d816 (commit)
via dcdc72aee7d835c08ca3565a83a3dae7389a4f87 (commit)
via 647e05d8265831a09f6c624928990cfd62896b39 (commit)
via 9622561636387ced932cc31e285d13cdba607c47 (commit)
from e708566e729239ed7857c357ee53419c44742ddd (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 d9815855bd6e442857fdae0c48335f9fe5d17507
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 28 11:09:30 2020 +0200
Bug 16314: Compiled CSS
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d716f2a18a7863f7b7f2e42fd8286b9982a52775
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 28 10:36:40 2020 +0200
Bug 15933: Add +x to the script
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 36895fee3a5aaea9096f5edfba29b408eb6975db
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 28 10:35:01 2020 +0200
Bug 26384: Add .t extension to make the script executed by CI
The test file is not run as it does not have the .t extension
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ae21c3adb16c0604c995a08a4082c3d1d60ab822
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Sep 22 11:01:30 2020 +0000
Bug 26505: Suspend hold modal broken in the OPAC
This patch makes corrections to the markup for the suspend hold modal in
the OPAC. It hadn't been updated during the upgrade to Bootstrap 4.
The JavaScript controlling the "suspend until" datepicker has been
modified because the datepicker pop-up was not positioned correctly in
this new version.
Unrelated: The markup for confirmation modals has been updated to
replace Bootstrap 3's "btn-default" with Bootstrap 4's "btn-secondary."
To test, apply the patch and make sure the SuspendHoldsOpac and
AutoResumeSuspendedHolds system preferences are enabled.
- Log in to the OPAC as a user who has holds.
- On the "Your summary" page open the "Holds" tab.
- In the list of holds, click the "Suspend" button.
- The modal should appear and look correct.
- Test the "Suspend until" field: Clicking in the form field should
trigger the datepicker. It should be positioned correctly under the
form field.
- Confirm that the datepicker populates the field.
- Submit the suspension and confirm that the hold is suspended.
- Click the "Cancel" button for a hold. Confirm that the confirmation
dialog appears correctly.
Edit: Updated class of hidden submit button. Test the page with JS
disabled to test that the "Suspend until" form works correctly.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ff08e99965ccb60092b5bdd5181fd517e1fab161
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Sep 4 12:47:58 2020 +0000
Bug 25758: Return on_reserve over too_soon when not calling from automatic_renewals cron
Bug 19014 altered CanBookBeRenewed to return (auto_)too_soon over on_reserve
For cron purposes this is the correct behaviour.
For display purposes we wish to see on_reserve over too_soon
This patchset adds a switch to 'CanBookBeRenewed' to alter the priority of these statuses
To test:
1 - set NoRenewalBeforePrecision to date only
2 - set a circ rule to auto-renewal=yes, no renewal before=0, checkout period to 7 days
3 - check item out
4 - confirm item shows Scheduled For Automatic Renewal in issues table
5 - place a hold on the item for another patron
6 - reload issues table for patron 1, confirm checkout still shows "scheduled for automatic renewal" rather than "on hold"
7 - change No Renewal Before value to 7
8 - reload issues table for patron 1, confirm checkout now shows "on hold"
9 - Apply patch
10 - restart_all
11 - Reload the issues table - confirm 'on_hold' still shows
12 - Change No Renewal Before to 0
13 - Refresh issues table, still shows 'On hold'
14 - perl misc/cronjobs/automatic_renewals.pl -v
15 - Result shows 'auto_too_soon'
16 - prove -v t/db_dependent/Circulation.t
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d19572ea765dbf6c13ba1343433ed07729413248
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 25 07:42:44 2020 +0000
Bug 25265: (QA follow-up) Check server type in Elasticsearch::index_records
Doing the same change as previously (renaming biblionumber), but fixing
at the same the record fetch. If (theoretically) an authority is passed
without a record, it would have fetched a biblio record.
Test plan:
You need Elasticsearch here.
Replaced this line in AddAuthority:
$indexer->index_records( $authid, "specialUpdate", "authorityserver", $record );
by
$indexer->index_records( $authid, "specialUpdate", "authorityserver", undef );
And updated an authority record. Check if you can search for the change.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
JD amended patch: remove trailing whitespace
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 501b9ea33667c7fdd87fe356b9fab364c10ab383
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 25 07:02:56 2020 +0000
Bug 25265: (QA follow-up) Rename biblionumber in ModZebra, index_records
ModZebra:
The name is very misleading: we can index authid's too here.
And yes, it should not be in C4/Biblio too ;) A first step..
Adding the same change here in Koha/SearchEngine/Zebra/Indexer.
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 47b594a3dcd59f13073716daf38696967d1faa77
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 25 06:29:14 2020 +0000
Bug 25265: (QA follow-up) Add shebang to Indexer.t
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 a7dde763dcb4e6f4d9d8a61e754f48758cbd03a4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Sep 23 18:57:26 2020 +0000
Bug 25265: (follow-up) Don't index malformed records
This is analogous to 26522, we shoudl skip record that cannot be retrieved for indexing
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 a690ba2b26ef6247cdf336077311e4afb0e94473
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Sep 22 17:38:03 2020 +0000
Bug 25265: Fix copy paste error for parameter
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
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 205d909a56f0170e1abf60bf880315e52f66fd21
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Sep 17 12:55:53 2020 +0000
Bug 25265: Rename skip_modzebra_update to skip_record_index
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
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 88cb7f223d31716c20e8f9341c64594b28ada33f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Aug 5 14:20:47 2020 +0200
Bug 25265: Prevent double reindex of the same item in batchmod
When batch editing, 2 reindex calls are sent to ES/Zebra.
We can easily avoid that reusing the skip_modzebra_update (renamed skip_record_index)
Additionally we should only send one request for biblio, and we should
only do it if we succeed
As the whole batch mod is in a transaction it is possible to fail in which case
Zebra queue is reset, but ES indexes have already been set
In addition to the skip param this patchset moves Zebra and Elasticsearch calls to
Indexer modules and introduces a generic Koha::SearchEngine::Indexer so that we don't
need to check the engine when calling for index
The new index_records routine takes an array so that we can reduce the calls to
the ES server.
The index_records routine for Zebra loops over ModZebra to avoid affecting current behaviour
Test plan:
General tests, under both search engines:
1 - Add a biblio and confirm it is searchable
2 - Edit the biblio and confirm changes are searchable
3 - Add an item, confirm it is searchable
4 - Delete an item, confirm it is not searchable
5 - Delete a biblio, confirm it is not searchable
6 - Add an authority and confirm it is searchable
7 - Delete an authority and confirm it is not searchable
Batch mod tests, under both search engines
1 - Have a bib with several items, none marked 'not for loan'
2 - Do a staff search that returns this biblio
3 - Items show as available
4 - Click on title to go to details page
5 - Edit->Item in a batch
6 - Set the not for loan status for all items
7 - Repeat your search
8 - Items show as not for loan
9 - Test batch deleting items
a - Test with a list of items, not deleting bibs
b - Test with a list of items, deleting bibs if no items remain where all items are only item on a biblio:
SELECT MAX(barcode) FROM items GROUP BY biblionumber HAVING COUNT(barcode) IN (1)
c - Test with a list of items, deleting bibs if no items remain where some items are the only item on a biblio:
SELECT MAX(barcode) FROM items GROUP BY biblionumber HAVING COUNT(barcode) IN (1,2)
10 - Confirm records are update/deleted as appropriate
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
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 6f989338899a3a4fe0cf131f0c63ef79f69a7bf2
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Sep 17 11:43:44 2020 +0000
Bug 25265: Unit tests
These cover Koha::SearchEngine::Indexer and ensure that all calls in the code
are routed correctly to the expected search engine
Bug 25265: (follow-up) Skip tests if elastic not configured
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
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 26ab04a3b383f5a9c88124625f8edc1c4cf1d816
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Sep 22 14:10:10 2020 -0400
Bug 26510: Transport Cost Matrix editor doesn't show all data when HoldsQueueSkipClosed is enabled
If HoldsQueueSkipClosed is enabled, and a library happens to be closed
on the day you edit the transport cost matrix, all the values for that
library will not show. Instead they will appear disabled, and if you
were to edit the cell and save a new value in it, it will also
'disappear' when the page is reloaded.
Test Plan:
1) Set today as a holiday for a library
2) Set HoldsQueueSkipClosed to 'open'
3) Go to the transport cost matrix editor
4) Edit a cell where the 'from' is for the closed library
5) Note the value doesn't 'save', it is still in the database though
6) Apply this patch
7) Restart all the things!
8) Reload the transport cost matrix editor
9) The value now appears correctly!
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dcdc72aee7d835c08ca3565a83a3dae7389a4f87
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Sep 11 16:03:28 2020 +0200
Bug 26434: Fix plugin dirs addition to @INC
Plugin dirs defined in koha-conf.xml are added to @INC in order to compile perl code.
Looks like with plack those dirs are added several times.
This may lead to an error "INCLUDE_PATH exceeds 64 directories".
This bug was identified with Carrousel plugin : https://inlibro.com/instructions-carrousel/
Test plan :
1) Enable plack and plugins
2) Look at page about.pl : @INC contains one plugin dir 'var/lib/plugins'
3) Install plugin KitchenSink : https://github.com/bywatersolutions/koha-plugin-kitchen-sink
4) Dont apply patch
5) Use configure on KitchenSink
6) Look at page about.pl : @INC contains server plugin dir 'var/lib/plugins'
7) Apply patch and restart plack
8) Use configure on KitchenSink
9) Look at page about.pl : @INC contains one plugin dir 'var/lib/plugins'
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 647e05d8265831a09f6c624928990cfd62896b39
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Fri Sep 11 18:16:28 2020 +0100
Bug 26438: Rename temporary Koha::Item variables to avoid conflict
Returns from Koha::Item calls were stored in temporary variables
called $item. Unfortunately they occur in routines already with
an $item variable holding a lineitem and hide that variable although
only required for two lines of code. An error occurs if girfield
is called on the wrong variable. Renamed all three occurences
of $item to $kitem to avoid the error
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9622561636387ced932cc31e285d13cdba607c47
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Aug 18 12:20:32 2020 +1000
Bug 26231: Remove incorrect use of AddAuthority() when 001 present
This patch removes the use of AddAuthority with a non-empty
authid argument, since that triggers an update rather than an insert.
In practice, the update also fails, but the error isn't raised,
as the database connection doesn't have RaiseError set.
Test plan:
1) Do not apply patch
2) Try to bulkmarcimport an authority file with a 001
3) Observe that the script reports success but no authority is added
4) Apply the path
5) Try to bulkmarcimport an authority file with a 001
6) Observe that the script reports success and the authority is added
Signed-off-by: Kyle M Hall <kyle 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>
-----------------------------------------------------------------------
Summary of changes:
C4/AuthoritiesMarc.pm | 7 +-
C4/Biblio.pm | 63 +++------
C4/Circulation.pm | 44 ++++--
C4/HoldsQueue.pm | 5 +-
C4/Items.pm | 37 +++--
Koha/EDI.pm | 12 +-
Koha/Item.pm | 16 ++-
Koha/Plugins.pm | 3 +-
Koha/Plugins/Handler.pm | 3 +-
Koha/SearchEngine/Elasticsearch/Indexer.pm | 46 ++++++
Koha/SearchEngine/{QueryBuilder.pm => Indexer.pm} | 29 ++--
Koha/SearchEngine/Zebra/Indexer.pm | 65 +++++++++
admin/transport-cost-matrix.pl | 2 +-
cataloguing/additem.pl | 11 +-
cataloguing/value_builder/marc21_field_260b.pl | 0
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../bootstrap/en/includes/holds-table.inc | 50 ++++---
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 16 ++-
koha-tmpl/opac-tmpl/bootstrap/js/global.js | 2 +-
misc/cronjobs/automatic_renewals.pl | 2 +-
misc/migration_tools/bulkmarcimport.pl | 11 --
t/db_dependent/Circulation.t | 10 +-
.../Koha/SearchEngine/Elasticsearch/Indexer.t | 11 ++
t/db_dependent/Koha/SearchEngine/Indexer.t | 156 +++++++++++++++++++++
tools/batchMod.pl | 30 +++-
...ed-executables => find-misplaced-executables.t} | 0
26 files changed, 481 insertions(+), 152 deletions(-)
copy Koha/SearchEngine/{QueryBuilder.pm => Indexer.pm} (55%)
create mode 100644 Koha/SearchEngine/Zebra/Indexer.pm
mode change 100644 => 100755 cataloguing/value_builder/marc21_field_260b.pl
create mode 100755 t/db_dependent/Koha/SearchEngine/Indexer.t
rename xt/{find-misplaced-executables => find-misplaced-executables.t} (100%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list