[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.05-66-g2812c38
Git repo owner
gitmaster at git.koha-community.org
Thu May 30 22:08:27 CEST 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, 18.11.x has been updated
via 2812c386f609cd9a688732624a8442cf99bc3a37 (commit)
via 6e7a795d1981ddb47f67002e61ebac5eecf9ea90 (commit)
via f307cf413f610e26a064abe904b11290f52de1be (commit)
via e7b75d3805e3a5a3e41352efc38a70931e0aeff1 (commit)
via 022b696057d8a83271744b5f1b08d00bd3b53669 (commit)
via 79c2222e60363946a584ad3c46e86253283864e8 (commit)
via b6ba99e327bdb1867893d1ed2a98d705f34cbe8a (commit)
via b2e2b918b0d3703ace65dddee451e160021bb45a (commit)
via 3773a33589520e4389efc0940f4d87844fffa7da (commit)
via 80b2104cf233cd807d985ce6058b851fe8490b3c (commit)
via 23265e2b6295fc4dd68199a40a73ef81307cc3cf (commit)
via 2c2de412bf8d392089230b6bb0ae6a668ac25dfe (commit)
via 5f55f0aeedf09134ad542b39e10d2e12ae8d0ded (commit)
via 64747f5c424cc598b7de2d4a4bb81e4d4122e8f3 (commit)
from c276dd6397211bacdc1881ec853619496b5bc53f (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 2812c386f609cd9a688732624a8442cf99bc3a37
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 16 14:07:25 2019 -0500
Bug 22917: Fix typo in another test file
It looks safe to do it here and now.
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: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 6ae2edb033ed7ebc2683026f42cf9400babd604b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6e7a795d1981ddb47f67002e61ebac5eecf9ea90
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu May 16 16:55:16 2019 +0100
Bug 22917: Fix a typo in an output_pref call
Due to a type in a call to output_pref (datenonly vs dateonly) we were
comparing logactions within a minutes accuracy. Counting the logs for
the day would be sufficient for the test ;)
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: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 04d990c71d34d0c44999cfdf80e8379959d14de8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f307cf413f610e26a064abe904b11290f52de1be
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 15 19:46:48 2019 -0500
Bug 22917: Prevent Circulation.t if tests ran too slowly
After bug 21213 we wanted to know why Circulation.t was failing randomly on a given test.
Since it is pushed, it failed (at least) twice, with the same error:
# Failed test 'AddReturn must have debarred the patron'
# at t/db_dependent/Circulation.t line 3112.
# got: ''
# expected: '1'
# AddReturn returned message $VAR1 = {
# 'WasReturned' => 1
# };
# Failed test 'Test at line 1918'
# at t/db_dependent/Circulation.t line 3116.
# got: '0'
# expected: '1'
# Failed test 'Test at line 1918'
# at t/db_dependent/Circulation.t line 3119.
# got: undef
# expected: '2019-05-30'
# Looks like you failed 3 tests of 21.
The test at line 3113 expects the flags 'WasReturned' and 'Debarred' to be set,
but only WasReturned is.
Which means the patron has not been debarred. It is not because the checkout has
not been detected as overdue.
If you apply only the first patch you will see that the tests are failing with
the exact same failures.
Indeed, if due_date is not passed to test_debarment_on_checkout, it is set to now (dt_from_string).
However, if the call and the test of the parameters inside the subroutine takes
more than 1 second,
then due_date will be after what we really expect. To reproduce that, we add
1 minute to due_date and we observe the tests failing.
The trick here (and we should have in all our tests) is to mock
DateTime->now to make sure dt_from_string will always return the same
value, it is what we expect from our tests (in 99.9% of the cases at
least).
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: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 6cf717e6c9e377850674ad6462480884a047145b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e7b75d3805e3a5a3e41352efc38a70931e0aeff1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 15 19:45:06 2019 -0500
Bug 22917: Recreate the failure
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: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 085cb4de51c528b6a50b60f591f6b5ac426efd6a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 022b696057d8a83271744b5f1b08d00bd3b53669
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed May 15 08:41:01 2019 +0200
Bug 22705: Change default value of cxn_pool to 'Static'
'Static' is the default value of Search::Elasticsearch and for a good
reason : it works in most cases, unlike the 'Sniff' option
To test:
1 - Apply patch
2 - Edit koha-conf.xml
3 - Add '<cxn_pool>Static</cxn_pool>' to the elasticsearch stanza
4 - Restart all the things!
5 - Reindex ES, it works
6 - Set SearchEngine to ES, try searching
7 - It works!
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 9532a3edeacd8fb3df67e8a01ed4e89069ffc017)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 79c2222e60363946a584ad3c46e86253283864e8
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri May 17 08:35:20 2019 +0000
Bug 22930: (QA follow-up) Add two test descriptions
No more than that ;)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 2ccc5dcdf124ff8275f58826c837fc55cfd8a9a1)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b6ba99e327bdb1867893d1ed2a98d705f34cbe8a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 16 12:56:07 2019 -0500
Bug 22930: Make TestBuilder->build_object explodes if parameters are wrong
This patch implements bug 15339 for build_object.
We want it to warn if the call is wrong.
Test plan:
Make sure the tests are still returning green
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 52325a771a02b603e807c29d586fe44fabebb792)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b2e2b918b0d3703ace65dddee451e160021bb45a
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat May 11 12:59:33 2019 +0000
Bug 21651: (QA follow-up) Remove remaining obsolete file from German web installer
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 71018d4cca41c9e9eeab1d8980af4f7253a728a8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3773a33589520e4389efc0940f4d87844fffa7da
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 24 17:02:39 2018 -0300
Bug 21651: Always insert notice templates related tables
The 3 following files must be mandatory and insert during the install process:
- message_transport_types.sql
- sample_notices_message_attributes.sql
- sample_notices_message_transports.sql
They insert data for
- message_transport_types
- message_attributes
- message_transport_type
Otherwise the notice templates (table letter) will fail.
Moreover these 3 files are identical and are put in several places (1 per language)
to make the description translatable (using the related .txt file)
Test plan:
- Install Koha in English and in another language
- Select all the sample data
=> They all should be inserted correctly
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 990cc79ef085b74764cd68875fc0fd6dc6da8ffe)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 80b2104cf233cd807d985ce6058b851fe8490b3c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 24 16:34:46 2018 -0300
Bug 21651: Remove language specific sql file for notice templates related tables
This patch removes the 3 following files for the different languages
- message_transport_types.sql
- sample_notices_message_attributes.sql
- sample_notices_message_transports.sql
They were all identical, only one version is kept in installer/data/mysql/mandatory
.txt files are removed as well
They inserted data for
- message_transport_types
- message_attributes
- message_transport_type
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 1114ba929f0aa634d6f9c10d8931c2ca25871c7d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 23265e2b6295fc4dd68199a40a73ef81307cc3cf
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu May 9 11:32:25 2019 +0100
Bug 22875: Document verbose option in import_patrons
Docs did not state that verbose can be repeated or that you
need more than 1 repetition to see lines that have failed
To test:
- Run ./import_patrons.pl -h
- Verify the additional documentation for -v is shown.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d9248c8802c4009ca99209da549447d13d6f686f)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2c2de412bf8d392089230b6bb0ae6a668ac25dfe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 16 12:31:23 2019 -0500
Bug 22847: [18.11] Correctly displayed circ rule values for max_holds
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5f55f0aeedf09134ad542b39e10d2e12ae8d0ded
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun May 12 00:34:03 2019 +0200
Bug 22886: Missing space between fields from Keyword to MARC mapping in cataloguing search
If you have multiple subfields mapped to the 'subtitle' keyword,
those fields will show up without separating space.
To test:
- Add 3 subtitle entries in Keyword to MARC mapping for a framework
- 245 b
- 245 c
- 245 h
- Edit a record, make sure the framework matches, add:
- 245 b, c, h
- Search for it in cataloguing search (not catalog!)
- Verify the subtitle fields show, but are all concatenated
- Apply patch
- Search again and verify the display is improved with a separating
space
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f00d909220ebde5162335e255e4ba938a9563bff)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 64747f5c424cc598b7de2d4a4bb81e4d4122e8f3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat May 11 10:23:28 2019 -0500
Bug 20514: Use streetnumber when searching for patrons by address
The streetnumber field was ignored from the search.
Test plan:
Create a patron with streetnumber="12", address="rue des cerisiers"
Search for patrons using the search field "street address"
using: 12 rue des cerisiers
=> Without this patch the patron will not be returned
=> With this patch applied it will!
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 97ec0a2e4bf76cf2e67a7ddbd463d9942a4fe383)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer.pm | 22 ++++++++------
C4/Utils/DataTables/Members.pm | 2 +-
Koha/SearchEngine/Elasticsearch.pm | 2 +-
Koha/Template/Plugin/CirculationRules.pm | 20 +++++++++++++
etc/koha-conf.xml | 3 ++
.../de-DE/mandatory/message_transport_types.txt | 2 --
.../sample_notices_message_attributes.sql | 8 ------
.../sample_notices_message_attributes.txt | 2 --
.../sample_notices_message_transports.txt | 2 --
.../mysql/en/mandatory/message_transport_types.sql | 7 -----
.../mysql/en/mandatory/message_transport_types.txt | 2 --
.../sample_notices_message_attributes.txt | 1 -
.../sample_notices_message_transports.sql | 20 -------------
.../sample_notices_message_transports.txt | 2 --
.../es-ES/mandatory/message_transport_types.sql | 7 -----
.../es-ES/mandatory/message_transport_types.txt | 1 -
.../sample_notices_message_attributes.sql | 9 ------
.../sample_notices_message_attributes.txt | 1 -
.../sample_notices_message_transports.sql | 20 -------------
.../sample_notices_message_transports.txt | 2 --
.../fr-CA/obligatoire/message_transport_types.sql | 8 ------
.../fr-CA/obligatoire/message_transport_types.txt | 1 -
.../sample_notices_message_attributes.sql | 8 ------
.../sample_notices_message_attributes.txt | 1 -
.../sample_notices_message_transports.sql | 20 -------------
.../sample_notices_message_transports.txt | 1 -
.../1-Obligatoire/message_transport_types.sql | 7 -----
.../1-Obligatoire/message_transport_types.txt | 2 --
.../sample_notices_message_attributes.sql | 9 ------
.../sample_notices_message_attributes.txt | 3 --
.../sample_notices_message_transports.sql | 20 -------------
.../sample_notices_message_transports.txt | 1 -
.../it-IT/necessari/message_transport_types.sql | 11 -------
.../it-IT/necessari/message_transport_types.txt | 2 --
.../sample_notices_message_attributes.sql | 11 -------
.../sample_notices_message_attributes.txt | 2 --
.../sample_notices_message_transports.sql | 24 ----------------
.../sample_notices_message_transports.txt | 1 -
.../mandatory/message_transport_types.sql | 0
.../sample_notices_message_attributes.sql | 0
.../sample_notices_message_transports.sql | 0
.../1-Obligatorisk/message_transport_types.sql | 28 ------------------
.../1-Obligatorisk/message_transport_types.txt | 1 -
.../sample_notices_message_attributes.sql | 9 ------
.../sample_notices_message_attributes.txt | 1 -
.../sample_notices_message_transports.sql | 20 -------------
.../sample_notices_message_transports.txt | 1 -
.../pl-PL/mandatory/message_transport_types.sql | 7 -----
.../pl-PL/mandatory/message_transport_types.txt | 1 -
.../sample_notices_message_attributes.sql | 9 ------
.../sample_notices_message_attributes.txt | 1 -
.../sample_notices_message_transports.sql | 20 -------------
.../sample_notices_message_transports.txt | 1 -
.../ru-RU/mandatory/message_transport_types.sql | 9 ------
.../ru-RU/mandatory/message_transport_types.txt | 2 --
.../sample_notices_message_attributes.sql | 11 -------
.../sample_notices_message_attributes.txt | 1 -
.../sample_notices_message_transports.sql | 20 -------------
.../sample_notices_message_transports.txt | 1 -
.../uk-UA/mandatory/message_transport_types.sql | 9 ------
.../uk-UA/mandatory/message_transport_types.txt | 1 -
.../sample_notices_message_attributes.sql | 15 ----------
.../sample_notices_message_attributes.txt | 1 -
.../sample_notices_message_transports.sql | 20 -------------
.../sample_notices_message_transports.txt | 1 -
.../prog/en/modules/admin/smart-rules.tt | 2 +-
.../prog/en/modules/cataloguing/addbooks.tt | 2 +-
misc/import_patrons.pl | 6 ++++
t/db_dependent/Circulation.t | 9 ++++--
t/db_dependent/Log.t | 2 +-
t/db_dependent/TestBuilder.t | 30 ++++++++++++++------
t/lib/TestBuilder.pm | 3 ++
72 files changed, 79 insertions(+), 432 deletions(-)
delete mode 100644 installer/data/mysql/de-DE/mandatory/message_transport_types.txt
delete mode 100644 installer/data/mysql/de-DE/mandatory/sample_notices_message_attributes.sql
delete mode 100644 installer/data/mysql/de-DE/mandatory/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/de-DE/mandatory/sample_notices_message_transports.txt
delete mode 100644 installer/data/mysql/en/mandatory/message_transport_types.sql
delete mode 100644 installer/data/mysql/en/mandatory/message_transport_types.txt
delete mode 100644 installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/en/mandatory/sample_notices_message_transports.sql
delete mode 100644 installer/data/mysql/en/mandatory/sample_notices_message_transports.txt
delete mode 100644 installer/data/mysql/es-ES/mandatory/message_transport_types.sql
delete mode 100644 installer/data/mysql/es-ES/mandatory/message_transport_types.txt
delete mode 100644 installer/data/mysql/es-ES/mandatory/sample_notices_message_attributes.sql
delete mode 100644 installer/data/mysql/es-ES/mandatory/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/es-ES/mandatory/sample_notices_message_transports.sql
delete mode 100644 installer/data/mysql/es-ES/mandatory/sample_notices_message_transports.txt
delete mode 100644 installer/data/mysql/fr-CA/obligatoire/message_transport_types.sql
delete mode 100644 installer/data/mysql/fr-CA/obligatoire/message_transport_types.txt
delete mode 100644 installer/data/mysql/fr-CA/obligatoire/sample_notices_message_attributes.sql
delete mode 100644 installer/data/mysql/fr-CA/obligatoire/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/fr-CA/obligatoire/sample_notices_message_transports.sql
delete mode 100644 installer/data/mysql/fr-CA/obligatoire/sample_notices_message_transports.txt
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/message_transport_types.sql
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/message_transport_types.txt
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_attributes.sql
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_transports.sql
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_transports.txt
delete mode 100644 installer/data/mysql/it-IT/necessari/message_transport_types.sql
delete mode 100644 installer/data/mysql/it-IT/necessari/message_transport_types.txt
delete mode 100644 installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql
delete mode 100644 installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/it-IT/necessari/sample_notices_message_transports.sql
delete mode 100644 installer/data/mysql/it-IT/necessari/sample_notices_message_transports.txt
rename installer/data/mysql/{de-DE => }/mandatory/message_transport_types.sql (100%)
rename installer/data/mysql/{en => }/mandatory/sample_notices_message_attributes.sql (100%)
rename installer/data/mysql/{de-DE => }/mandatory/sample_notices_message_transports.sql (100%)
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/message_transport_types.sql
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/message_transport_types.txt
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_attributes.sql
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_transports.sql
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_transports.txt
delete mode 100644 installer/data/mysql/pl-PL/mandatory/message_transport_types.sql
delete mode 100644 installer/data/mysql/pl-PL/mandatory/message_transport_types.txt
delete mode 100644 installer/data/mysql/pl-PL/mandatory/sample_notices_message_attributes.sql
delete mode 100644 installer/data/mysql/pl-PL/mandatory/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/pl-PL/mandatory/sample_notices_message_transports.sql
delete mode 100644 installer/data/mysql/pl-PL/mandatory/sample_notices_message_transports.txt
delete mode 100644 installer/data/mysql/ru-RU/mandatory/message_transport_types.sql
delete mode 100644 installer/data/mysql/ru-RU/mandatory/message_transport_types.txt
delete mode 100644 installer/data/mysql/ru-RU/mandatory/sample_notices_message_attributes.sql
delete mode 100644 installer/data/mysql/ru-RU/mandatory/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/ru-RU/mandatory/sample_notices_message_transports.sql
delete mode 100644 installer/data/mysql/ru-RU/mandatory/sample_notices_message_transports.txt
delete mode 100644 installer/data/mysql/uk-UA/mandatory/message_transport_types.sql
delete mode 100644 installer/data/mysql/uk-UA/mandatory/message_transport_types.txt
delete mode 100644 installer/data/mysql/uk-UA/mandatory/sample_notices_message_attributes.sql
delete mode 100644 installer/data/mysql/uk-UA/mandatory/sample_notices_message_attributes.txt
delete mode 100644 installer/data/mysql/uk-UA/mandatory/sample_notices_message_transports.sql
delete mode 100644 installer/data/mysql/uk-UA/mandatory/sample_notices_message_transports.txt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list