[koha-commits] main Koha release repository branch master updated. v19.11.00-1696-g65c5407d41
Git repo owner
gitmaster at git.koha-community.org
Tue Apr 14 10:04:33 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 65c5407d41fd5ba8a37f163b1a02e9c5a8cfa9f8 (commit)
via 81c141d41aef41d2dbdd50b1874f4964b83d6767 (commit)
via 967c781259ead4367b55cc37bf50938b1d7c984e (commit)
via a9ee30774a748e23e315228b9c706acf80cc9a38 (commit)
via 51e504cbfe2fe046da840a4c23090d476fcdb6f8 (commit)
via 0004816118483dc132c98d27c417f1b59255441f (commit)
via 7bcfa8219739312f60eb2e36f642d7ac685d9879 (commit)
via 12243e35962e09b04fd247150477cbc2cfda7254 (commit)
via 7d9842a7cc969571c53c9e1fafdc145bbd6036c7 (commit)
via daf033945746edb60d7b76ab69204d1e859fe3ed (commit)
via d54376a52374a2b83eadd40dd35d8bbfcba2de63 (commit)
via 0e2119570d9c8deb0b15b8bff92975cfdfa5c3f4 (commit)
via 3336147258cd71c446026919469ba052a62b6bac (commit)
via ed69870da5253a3cca853d841d2e3adb844b31fb (commit)
via 3dd79180f33bcdf810251638ae3984cbc832e024 (commit)
via 9ac2ddda0b1506ea09a7c95a98926ea9e9c36bcf (commit)
via 9e2f3200eaf2d09c0124fbf506d114b95b2f1920 (commit)
via 25966df4d7164e931e35ae5a640ae85eb2644ce3 (commit)
via a57efe865921c4d4945245d3970b3391490de249 (commit)
via a22315ef6153d5c64b4dfd763cf6802a3035e941 (commit)
via f7cb46560322ef77858c6f489ae332962942616d (commit)
via f406aa2ae35c0d49a91316d00a4fca0cd0109c5c (commit)
via 04e4656cd252759efae3606b8e368cfab1dbff5f (commit)
via f5447b33de9ded3868d97fcf033c7acda33cc168 (commit)
via 94ed64e5b1e348fcd06d2d41b880c52b6822df57 (commit)
via 479474e532dca6ded90770fc7a0c00500ea4f787 (commit)
via 6fa71e82f80c838f4182587f691d1c329a0941bd (commit)
via 3eec846d7f49c39cb4b4079818eeb42268aca769 (commit)
via aa967afa8ec12988a8118ba3b41dd3df3f3fe18f (commit)
from 78b67d21c5f15bccdc7ae8f180d4f0a266196e9f (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 65c5407d41fd5ba8a37f163b1a02e9c5a8cfa9f8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 2 16:03:17 2020 +0200
Bug 25044: Remove the need to define koha_object[s]_class for standard object class names
In Koha::Object[s]->prefetch_whitelist, there is a call to the koha_object[s]_class DBIC resultset class. We should not, otherwise those 2 methods will have to be defined all the time, even when we can guess it easily.
Koha::Item <> Schema::Result::Item => standard
Koha::Acquisition::Order <> Schema::Result::Aqorder => non-standard
sub _get_object_class {
my ( $type ) = @_;
return unless $type;
if( $type->can('koha_object_class') ) {
return $type->koha_object_class;
}
$type =~ s|Schema::Result::||;
return ${type};
}
Test plan:
% prove t/db_dependent/Koha/Object.t t/db_dependent/Koha/Objects.t
should return green before and after this patch
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 81c141d41aef41d2dbdd50b1874f4964b83d6767
Author: David Roberts <david at koha-ptfs.co.uk>
Date: Mon Apr 13 01:22:07 2020 +0000
Bug 20370: Misleading comment for bcrypt - #encrypt it; Instead it should be #hash it
This patch changes the wording of the comment
To test:
1) Check the wording of Line 67 of Koha/AuthUtils.pm
2) Apply the patch
3) Check that the wording has changed from "Encrypt it" to "Hash it"
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 967c781259ead4367b55cc37bf50938b1d7c984e
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu Apr 9 15:50:04 2020 +0000
Bug 24993: fix increment
Aparently ((i++)) isn't portable, changed for an admittedly uglier
but functional increment.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a9ee30774a748e23e315228b9c706acf80cc9a38
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Apr 8 11:57:06 2020 +0200
Bug 24993: Make sure we are not going to loop indefinitely
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 51e504cbfe2fe046da840a4c23090d476fcdb6f8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 2 12:36:16 2020 +0200
Bug 24993: Make sure SIP server is stopped before restarting it
Sometimes doing koha-sip --restart instance happens too fast and
the SIP server is not started.
To test:
- have SIP enabled and running for your instance
- issue a restart, make sure it restarts
sudo koha-sip --restart inst
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0004816118483dc132c98d27c417f1b59255441f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Mar 30 10:06:43 2020 -0300
Bug 25008: Overload Koha::RecordProcessor->options to update filters
This patch overloads the 'options' accessor generated by Class:Accessor.
It does so the passed options are used to refresh the loaded filters.
Tests are added for this overloaded method as well.
To test:
1. Apply this patches
2. Run:
$ kshell
k$ prove t/RecordProcessor.t
=> SUCCESS: Tests pass!
3. Sign off :-D
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7bcfa8219739312f60eb2e36f642d7ac685d9879
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Mar 30 10:20:11 2020 -0300
Bug 25008: Tests for ->options
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 12243e35962e09b04fd247150477cbc2cfda7254
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Mar 27 17:53:32 2020 -0300
Bug 25008: Regression tests
This patch highlights a behaviour of Koha::RecordProcessor that is
unexpected: if you change the original options using ->options, the
loaded filters don't pick the change. That's because the filter objects
are loaded on ->new, and they are never updated.
To test:
1. Apply this patch
2. Run:
$ kshell
k$ prove t/RecordProcessor.t
=> FAIL: Test prove ->options doesn't update the filters!
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7d9842a7cc969571c53c9e1fafdc145bbd6036c7
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Thu Mar 26 22:46:26 2020 +0000
Bug 24764: TinyMCE shouldnt do automatic code cleanup when editing HTML in News Feature
TEST PLAN:
1. Make a new news item and use the TinyMCE editor, click on the <> icon to go to the Source code editor
2. Add some HTML like <i class="fa fa-facebook-official" aria-hidden="true">TEST</i> and save it.
3. Go back in and notice that TinyMCE has changed it to: <p><em class="fa fa-facebook-official">TEST</em></p>
4. It should not auto clean up and also it should not autowrap with <p> tag.
5. Apply patch patch, and repeat step 2. Save again.
6. It should not have automatiicly changed any HTML or added any <p> wrapper.
Signed-off-by: David Cook <dcook at prosentient.com.au>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit daf033945746edb60d7b76ab69204d1e859fe3ed
Author: Marcel de Rooy <mdry at live.nl>
Date: Thu Mar 19 14:39:14 2020 +0100
Bug 24903: Add tests for _handle_seqno
Trivial tests.
Test plan:
Run t/Serials/ModSerialStatus.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Laurence Rault <laurence.rault at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d54376a52374a2b83eadd40dd35d8bbfcba2de63
Author: Marcel de Rooy <mdry at live.nl>
Date: Thu Mar 19 14:20:38 2020 +0100
Bug 24903: Special characters like parentheses in numbering pattern cause duplication in recievedlist
Test plan:
Use serial with a numbering pattern with parentheses like "2018 (No. 1)".
Mark serial issue as arrived, check receivedlist on summary.
Edit issue again, check if not duplicated on receivedlist.
Mark issue as missing or not available, check missinglist.
Mark missing issue as not missing, check list again.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Laurence Rault <laurence.rault at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0e2119570d9c8deb0b15b8bff92975cfdfa5c3f4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Apr 7 13:25:09 2020 +0200
Bug 25038: Fix tabs on the OPAC reading history view
OPAC reading history table has three tabs for different checkout types: All, Checkouts, On-site checkouts.
However, all of your checkouts are visible every tab regardless of checkout type.
Test plan:
1. Enable OnSiteCheckouts system preference
2. Perform two checkouts: one normal checkout, one on-site checkout
3. Go to OPAC /cgi-bin/koha/opac-readingrecord.pl
4. Observe your checkouts all are visible in first tab
5. Select second tab and notice that the table is now filtered
6. Same with third tab
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Lari Taskula <lari.taskula at hypernova.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3336147258cd71c446026919469ba052a62b6bac
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 10 06:43:51 2020 -0400
Bug 24966: Add unit tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ed69870da5253a3cca853d841d2e3adb844b31fb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Apr 10 09:50:13 2020 +0000
Bug 24966: (QA follow-up) Fix return value of hold_patron_bcode
It is used in list context, but we need a scalar value.
Can be fixed by adding scalar's, or returning empty string as here.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3dd79180f33bcdf810251638ae3984cbc832e024
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Apr 3 11:16:39 2020 +0100
Bug 25040: monkeypatch Schema::Loader for recent MariaDB
Recent versions of MariaDB changed the output of 'DESCRIBE' for
timestamp columns with defaults from `CURRENT_TIMESTAMP` to
`current_timestamp()`. As such the code inside
DBIx::Class::Schema::Loader which catches such cases and outputs
`\"current_timestamp"` as a sensible cross platform default is missed
and this leads of inconsistent class files and bugs with out default
lookup code in Koha::Objects.
This patch serves as a backport of the code I have submitted upstream
such that out developers can continue to use update_dbix_class_files.pl
to build their schema classes from the database and regardless of their
db server version get a consistently correct output.
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>
commit 9ac2ddda0b1506ea09a7c95a98926ea9e9c36bcf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 6 12:44:13 2020 +0200
Bug 25069: Fix AddressFormat="fr" behavior
Something went wrong during a rebase of bug 13618
commit dcd1f5d48c758aee17b6c6f069c6146b42efe117
Bug 13618: Add html filters to all the variables
Several changes related to AddressFormat are wrong:
- [% IF Koha.Preference( 'AddressFormat' ) %]
- [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
- [% ELSE %]
- [% INCLUDE 'member-main-address-style-us.inc' %]
- [% END %]
+ [% SWITCH Koha.Preference( 'AddressFormat' ) %]
+ [% CASE 'de' %]
+ [% INCLUDE 'member-main-address-style-de.inc' %]
+ [% CASE # us %]
+ [% INCLUDE 'member-main-address-style-us.inc' %]
+ [% END %]
Test plan:
Create a patron with all the address fields filled
Play with the 3 option values of AddressFormat, and confirm that the address is displayed correctly
on the patron's view, and in the patron module (top left)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9e2f3200eaf2d09c0124fbf506d114b95b2f1920
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Apr 7 13:32:51 2020 +0200
Bug 25005: (bug 22868 follow-up) Fix suggestions pending on main page
There is a "Suggestions pending approval" link on the main page that is
displayed if there are new suggestions and the logged in user has the
permission to manage them.
On bug bug 22868 the permission changed from
acquisition.suggestions_manage to suggestions.suggestions_manage
But in the template, one occurrence has not been replaced correctly
(certainly because it was already wrong actually).
Test plan:
Create a suggestion at the OPAC
Create a patron with the suggestions permission
Use this patron to login at the staff interface
=> Without this patch the link does not appear on the main page
=> With this patch applied the link appears
Signed-off-by: David Roberts <david at koha-ptfs.co.uk>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 25966df4d7164e931e35ae5a640ae85eb2644ce3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 11 13:01:52 2020 +0100
Bug 24800: Handle inexistent return date on self checking
See bug 24800 comment 0 for a description of the problem.
We do not want the SIP server to crash if it receives a checkin request
with a return date that is not given.
The option this patch chose is to parse it only if provided.
Signed-off-by: Clemens Elmlinger <clemens.elmlinger at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a57efe865921c4d4945245d3970b3391490de249
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 11 12:56:41 2020 +0100
Bug 24800: Add tests
Signed-off-by: Clemens Elmlinger <clemens.elmlinger at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a22315ef6153d5c64b4dfd763cf6802a3035e941
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 3 12:14:27 2020 +0000
Bug 25050: Adjust marc_records_to_documents to search entire mapping array
There was an assumption in the ES code that match-heading mappings will appear in
a specified portion of the mappings array.
Certain mappings setups will not meet this assumption.
We need to move our searching up one level
The key seems to be having a mapping for a complete field, say 150, in both the
match-heading and another field as well as having mappings for ungrouped fields like
150a 150ab etc.
The unit test coverage should be sufficient for testing
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f7cb46560322ef77858c6f489ae332962942616d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 3 12:12:49 2020 +0000
Bug 25050: Unit tests
This patch simplay alters the data we use for the tests, doing so causes them to fail
To test:
1 - Apply only this patch
2 - prove -v t/Koha/SearchEngine/Elasticsearch.t
3 - It fails!
4 - Apply next patch
5 - It passes!
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f406aa2ae35c0d49a91316d00a4fca0cd0109c5c
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Mon Mar 16 22:09:51 2020 +0000
Bug 24266: (alternate patch) Only use defined borrowernumbers in reconcile_balances.pl cron
I believe the error is triggered when borrowernumbers are left empty in
the accountlines table. Not sure why this would happen, but it appears
to be what causes the problem.
Do not apply the first patch if testing this patch.
To test:
1) sudo koha-mysql INSTANCENAME
2) Create a test borrower, add any payment etc to create an accountline,
then delete this borrower
3) ensure the AccountAutoReconcile syspref is disabled
4) Go to another borrower's accounting tab
5) Create a manual credit or debit. Confirm this shows in the 'Make a
payment' tab as an amount that COULD be applied, but isn't automatically
applied
6) in your terminal, run the reconcile_balances.pl script
7) Confirm the error does not show in the logs and the balance for
the borrower is correctly reconciled.
Sponsored-by: Horowhenua District Council
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 04e4656cd252759efae3606b8e368cfab1dbff5f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 9 08:24:44 2020 -0400
Bug 25095: Remove warn left in FeePayment.pm
It appears that a debugging statement was accidentally left in FeePayment.pm by bug 5605.
Signed-off-by: Devinim <kohadevinim at devinim.com.tr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f5447b33de9ded3868d97fcf033c7acda33cc168
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Apr 8 10:52:23 2020 -0400
Bug 22778: Add unit test
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 94ed64e5b1e348fcd06d2d41b880c52b6822df57
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 25 15:50:35 2019 -0400
Bug 22778: Suggestions with no "suggester" can cause errors
If one tries to modify a suggestion that has no suggester you will get the following error:
Can't call method "lang" on an undefined value at /usr/share/koha/lib/C4/Suggestions.pm line 506
Koha assumes that every suggestion has a borrowernumber in suggestedby
Test Plan:
1) Create a suggestion with an unpopulated suggestedby
2) Attempt to modify that suggestion
3) Note the error
4) Apply this patch
5) Restart all teh things
6) Attempt to modify that suggestion
7) No error!
Signed-off-by: David Roberts <david at koha-ptfs.co.uk>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 479474e532dca6ded90770fc7a0c00500ea4f787
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Apr 8 16:11:54 2020 +0200
Bug 24027: Add POD about the new parameter in Koha::Item->store
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6fa71e82f80c838f4182587f691d1c329a0941bd
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Apr 8 10:17:32 2020 -0300
Bug 24027: (QA follow-up) Fix POD warning
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3eec846d7f49c39cb4b4079818eeb42268aca769
Author: Andrew Nugged <nugged at gmail.com>
Date: Mon Apr 6 19:11:35 2020 +0300
Bug 24027: Call ModZebra once after all items added/deleted in a batch
Issue description:
- call to ModZebra was unconditional inside 'store' method for Koha::Item,
so it was after each item added, or deleted.
- ModZebra called with param biblionumber, so it is the same parameter
across calls for each items with same biblionumber, especially when we
adding/removing in a batch.
- with ElasticSearch enabled this makes even more significant load
and it is also progressively grows when more items already in DB
Solution:
- to add extra parameter 'skip_modzebra_update' and propagate it down to
'store' method call to prevent call of ModZebra,
- but to call ModZebra once after the whole batch loop in the upper layer
Test plan / how to replicate:
- make sure that you have in the admin settings "SearchEngine" set to
"Elasticsearch" and your ES is configured and working
( /cgi-bin/koha/admin/preferences.pl?op=search&searchfield=SearchEngine )
- select one of biblioitems without items
( /cgi-bin/koha/cataloguing/additem.pl?biblionumber=XXX )
- press button "add multiple copies of this item",
- enter 200 items, start measuring time and submit the page/form...
On my test machine when adding 200 items 3 times in a row (so 600 in
total, but to show that time grows with every next batch gradually):
WHEN ElasticSearch DISABLED (only Zebra queue):
- 9s, 12s, 13s
WHEN ElasticSearch ENABLED:
- 1.3m, 3.2m, 4.8m
WITH PATCH WHEN ElasticSearch ENABLED:
- 10s, 13s, 15s
Same slowness (because also same call to ModZebra) happens when you try
to delete all items ("op=delallitems"). And same fix.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit aa967afa8ec12988a8118ba3b41dd3df3f3fe18f
Author: Theodoros Theodoropoulos <theod at lib.auth.gr>
Date: Wed Apr 8 08:21:12 2020 +0100
Bug 23514: Split Call Numbers for all layout types
This patch ensures call numbers are properly split for layout types
other than 'BAR'.
Test plan:
1. Go to Label Creator and choose/create a Label Layout with "Choose
layout type: Biblio"
2. make sure you have at least "itemcallnumber" in Bibliographic data to
print/Data fields
3. check "Split call numbers" box and save the layout (ie testlayout)
4. create a label batch, using items that have a call number (ie
DC611.B848 H84 1997). LCC is used here, but you may try with Dewey as
well.
5. export selected batch using any template and the layout you created
in previous step to a PDF
6. Call numbers are splitted (as expected) in the resulting PDF file
7. edit the layout you created in the previous step (ie testlayout) and
change the "Choose layout type:" to either Biblio/Barcode (BIBBAR) or
Barcode/Biblio (BARBIB)
8. export the same batch using the same template and layout as before
9. Call numbers are NOT splitted at all
After patch is applied, call numbers splitting functions are applied
even in Biblio/Barcode (BIBBAR) or Barcode/Biblio (BARBIB) layout types.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Items.pm | 18 +++++--
C4/Labels/Label.pm | 2 +-
C4/SIP/ILS/Item.pm | 4 +-
C4/SIP/ILS/Transaction/Checkin.pm | 27 +++++-----
C4/SIP/ILS/Transaction/FeePayment.pm | 2 -
C4/Serials.pm | 29 ++++++++---
C4/Suggestions.pm | 3 +-
Koha/AuthUtils.pm | 2 +-
Koha/Item.pm | 30 ++++++++---
Koha/Object.pm | 2 +-
Koha/RecordProcessor.pm | 23 +++++++++
Koha/Schema/Loader/mysql.pm | 59 ++++++++++++++++++++++
Koha/SearchEngine/Elasticsearch.pm | 2 +-
cataloguing/additem.pl | 9 +++-
debian/scripts/koha-sip | 10 ++++
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 9 ++--
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +-
.../prog/en/modules/members/memberentrygen.tt | 20 ++++----
.../prog/en/modules/tools/koha-news.tt | 4 ++
.../bootstrap/en/modules/opac-readingrecord.tt | 10 ++--
misc/cronjobs/reconcile_balances.pl | 3 +-
misc/devel/update_dbix_class_files.pl | 8 ++-
t/Koha/SearchEngine/Elasticsearch.t | 41 ++++++++++++---
t/RecordProcessor.t | 54 ++++++++++++++++++++
t/Serials/ModSerialStatus.t | 38 ++++++++++++++
t/db_dependent/Koha/Object.t | 10 +++-
t/db_dependent/Koha/Objects.t | 10 +++-
t/db_dependent/SIP/Message.t | 32 +++++++++++-
t/db_dependent/SIP/Transaction.t | 56 +++++++++++++++++++-
t/db_dependent/Suggestions.t | 35 ++++++++++++-
30 files changed, 477 insertions(+), 77 deletions(-)
create mode 100644 Koha/Schema/Loader/mysql.pm
create mode 100755 t/Serials/ModSerialStatus.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list