[koha-commits] main Koha release repository branch master updated. v17.05.00-389-g7b5457c
Git repo owner
gitmaster at git.koha-community.org
Tue Aug 15 17:27:49 CEST 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 7b5457cd0f17173ae9ebca2e71696cc09709a910 (commit)
via d934e72f5d7ee919b7a1e2e013a317371c20d37f (commit)
via a43a8cb1be575fce59f7327c2f906fff36bce48d (commit)
via 34587fafecf8e274586715dce2c04b0f557ce313 (commit)
via 73aa4e65c0a45c230479de93cdee3dc55f93c3f9 (commit)
via 7efb871fa31869044045ccef0b37be438ba704ff (commit)
via e4573d709936bbd7f454a26f073e2131aa9c8df3 (commit)
via a66c0b1dd76a2fe08ed7ac189ad8a564372ab3a9 (commit)
via a58745d9dbbf98c79f4c1a3e7cd40fb45425fc91 (commit)
via 0936f642d558d2866d675d0120f047ad02ecbb1f (commit)
via 1c2ee5903cfe19379d20a847558fb0c176580cc0 (commit)
via e03f590fa1080b1c3fbe25c91af08094620609d6 (commit)
via b1ba7fac2c246c2dd52aa4d35884a03d542a26f4 (commit)
via b57d682edd5040eb342047aefa95b84402f4c3ae (commit)
via a423fcff42da05e9ebf9f2b4a2f192023346e93e (commit)
via d8f6315b6d9b1c7145f6036b55b7927f6d6e6e48 (commit)
via 0987b135ea0bb8fbd4fc39643b19715dc6e3a1c8 (commit)
via 83f60adbab8e96f0f14ec547029582623ac3a068 (commit)
via d24568b67256fab79b42ead54302c76d1c9653d7 (commit)
via 3c6168d37436b7312e130f796d47271ff2de77cf (commit)
via 14484ba4234fd1cbb925b5f3a4844da863c65d5a (commit)
via 2ee4e0ac381ed23fa23b1117725b2f6a0e0db4de (commit)
via a10e5383016a5cb4117719ac858cbe02a53e457b (commit)
via 8403799c7212349bee70090249e3425afd62423b (commit)
via 07c0d968b70421852ac4915633fa7f3cbd0d18cd (commit)
via 9c8a04acb05466356fec8e9d6d13183295719c7d (commit)
via 3808dbc1d22b3adc43a09ba7ce00aaca01f95f5a (commit)
via 03c5eb0babc3fd7b0ecf45a8a5db91a67718d3b4 (commit)
via 9d7d524f21fbf83ef7e1031e36c9772ffe21db90 (commit)
via cfb52579ec2f8859226e0e40f66d5a6d7a2ed73f (commit)
via b308b0814bcd149e3f899058e693938d982bb425 (commit)
via ff41b87302c1b242f9edd7b2e8c253bd18b57ac1 (commit)
from c140b9129124262db27c9ba17f47134ec3232ada (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 7b5457cd0f17173ae9ebca2e71696cc09709a910
Author: Baptiste Wojtkowski <baptiste.wojtkowski at biblibre.com>
Date: Mon Jul 10 08:11:33 2017 +0000
Bug 18919: Repair "Transaction branch" in cash_register_stats.pl
- values of the option fields are now correctly loaded
TEST PLAN:
go to domain/cgi-bin/koha/reports/cash_register_stats.pl
1 - Make a report for all branches => it works
2 - Make a report for any branch => you will get the same or no result
3 - apply patch
4 - Repeat 2 => it should work
Followed test plan worked as intended
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d934e72f5d7ee919b7a1e2e013a317371c20d37f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu May 25 12:40:43 2017 +0000
Bug 12644 - Add subtitles to staff client cart
This patch adds display of subtitles to the staff client cart.
To test you should have some values mapped to subtitle in Administration
-> Keyword to MARC Mapping.
1. Apply the patch.
2. Add some records to the staff client cart which have subtitles.
3. Open the cart and onfirm that subtitles display correctly in both the
brief and "More details" view.
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 a43a8cb1be575fce59f7327c2f906fff36bce48d
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Jun 28 23:31:12 2017 +0000
Bug 18877: Add documentation on dbhost for koha-create help
TEST PLAN
---------
apply bugs 9409 and 14533 (order is irrelevant)
trigger message about missing database name
-- notice it fails to mention dbhost
apply this patch
trigger message again
-- notice it mentions dbhost
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 34587fafecf8e274586715dce2c04b0f557ce313
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Jun 22 19:26:33 2017 +0000
Bug 14533: Make --use-db display a message if no DB defined
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 73aa4e65c0a45c230479de93cdee3dc55f93c3f9
Author: Yarik Dot <yarikdot at gmail.com>
Date: Thu Jun 22 17:53:00 2017 +0000
Bug 14533: remove CREATE USER when koha-create --use-db
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7efb871fa31869044045ccef0b37be438ba704ff
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Aug 11 15:09:00 2017 -0300
Bug 9409: (QA followup) Add --dbhost help to koha-create man page
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e4573d709936bbd7f454a26f073e2131aa9c8df3
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Jun 23 01:46:50 2017 +0000
Bug 9409: Add --dbhost parameter and dbhost field
This allows setting the remote db host correctly for
request-db either with a command-line or passwd file.
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a66c0b1dd76a2fe08ed7ac189ad8a564372ab3a9
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 7 11:25:24 2017 +0000
Bug 18469: QA Follow-up
Restore datepicker class
Use Koha.Preference
Copy changes to moremember
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 a58745d9dbbf98c79f4c1a3e7cd40fb45425fc91
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 21 10:08:27 2017 -0400
Bug 18469: Suspend all holds when specifying a date to resume hold does not keep date
Name of field had 'datepicker' embedded, this caused variable issue
To test:
1 - Place several holds for a patron
2 - Go to holds tab in circulation
3 - Select a date for suspend all holds until
4 - Suspend all holds
5 - Note date is not used, suspended indefinitely
6 - Apply patch
7 - Resume all suspended holds
8 - Select a date for suspend all holds until
9 - Suspend all holds
10 - Note date is used
Signed-off-by: Owen Leonard <oleonard at myacpl.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 0936f642d558d2866d675d0120f047ad02ecbb1f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 11 08:11:20 2017 +0200
Bug 19061: [QA Follow-up] Wrong interpolation
Interpolating "$object->method" does not work.
Unable to execute query [Object class]=HASH(0x3c21cc8)->method.
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 1c2ee5903cfe19379d20a847558fb0c176580cc0
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Aug 8 11:47:40 2017 +0100
Bug 19061: Avoid SQL Injection vulnerability
Embedding values in the SQL statement allows the passing of values
that would normally be rejected resulting in mysql errors
variables should always be passed via placeholders and
the execute call
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 e03f590fa1080b1c3fbe25c91af08094620609d6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 9 13:01:37 2017 -0300
Bug 18292: Tests do not need to return 1 - xt
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 b1ba7fac2c246c2dd52aa4d35884a03d542a26f4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 9 08:59:41 2017 -0300
Bug 18292: Remove return 1 statements in tests
The test files do not need to return 1
Patch generated with:
perl -p -i -e "s/^1;\n//xsm" t/**/*.t
Test plan:
git grep '^1;$' t/**/*.t
should not return any results
NOTE: does not fix C4/SIP/t, nor xt tests.
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 b57d682edd5040eb342047aefa95b84402f4c3ae
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Fri Mar 17 09:05:47 2017 +0200
Bug 18292 - t/db_dependent/Circulation.t doesn't need to return 1;
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 a423fcff42da05e9ebf9f2b4a2f192023346e93e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 11 08:34:45 2017 +0200
Bug 19049: [QA Follow-up] Mock config, default format
As requested by QA:
[1] Mock_config enable_plugins in the test.
[2] Fallback to MARC when format is empty. Remove die statement.
Added:
[3] Remove $marc. This variable got obsolete during development.
[4] Add test on $input_file and $plugin_class. Test $text before calling
Handler or processing $text. No need to split undef if somehow Handler
returned undef, etc. If the routine returns an empty arrayref,
stage-marc-import will do fine.
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 d8f6315b6d9b1c7145f6036b55b7927f6d6e6e48
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Aug 10 09:02:37 2017 -0400
Bug 19049 [QA Followup] - Make plugin name first item in description
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0987b135ea0bb8fbd4fc39643b19715dc6e3a1c8
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 10 13:02:23 2017 +0200
Bug 19049: [Follow-up] Make sure that GetPlugins finds the plugin
We have to mock_config the pluginsdir before Plugins is loaded, and
we should pass an absolute path (not a relative one).
If you did not install the test to_marc plugin, this test would fail.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Verified patch is compatible with original KitchenSink to_marc plugin
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 83f60adbab8e96f0f14ec547029582623ac3a068
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Aug 8 14:51:41 2017 +0200
Bug 19049: Testing RecordsFromMarcPlugin with a to_marc plugin
This patch adds a simple to_marc plugin in t/Koha/Plugin that is used
in the added subtest in ImportBatch.t.
Test plan:
[1] Run t/db_dependent/ImportBatch.t
[2] Copy the to_marc test plugin from t to your plugin directory.
Under Debian packages, you should do something like:
mkdir -p /var/lib/koha/master/plugins/Koha/Plugin/
cp [yourclone]/t/Koha/Plugin/MarcFieldValues.pm /var/lib/koha/master/plugins/Koha/Plugin/
[3] Check if you see this plugin on plugins/plugins-home.pl
[4] Create a text file with some fields like:
(Note: The plugin needs an empty line between both "records".)
100,a = Test Author 1
245,a = Title One
100,a = Author 2
245,a = Title Two
[5] Go to stage-marc-import.pl. Upload the created file. Select the plugin
in the format combo and proceed. Did you create two records ?
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d24568b67256fab79b42ead54302c76d1c9653d7
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 7 21:24:48 2017 +0200
Bug 19049: Fix regression on stage-marc-import with to_marc plugin
Bug 12412 added the use of to_marc plugins allowing arbitrary file formats
in stage-marc-import (as long as the plugins can handle them). The feature
was not very visible in the code, and when bug 10407 added the marcxml
format, it made some changes that broke the use of to_marc.
This patch restores the functionality by:
[1] Adding a sub RecordsFromMarcPlugin to ImportBatch.pm, specifically
addressing the conversion from arbitrary formats to MARC::Record.
The original to_marc interface is used: pass it the file contents,
and it returns a string consisting of a number of MARC blobs separated
by \x1D.
Consequently, the call of to_marc is removed from routine
BatchStageMarcRecords where it did not belong. The to_marc_plugin
parameter is removed and two calls are adjusted accordingly.
[2] Instead of a separate combo with plugins, the format combo contains
MARC, MARCXML and optionally some plugin formats.
[3] The code in stage-marc-import.pl now clearly shows the three main
format types: MARC, MARCXML or plugin based.
Note: This patch restores more or less the situation after bug 12412, but
I would actually recommend to have the to_marc plugins return MARC::Record
objects instead of large text strings. In the second example I added a
to_marc plugin that actually converts MARC record objects to string format,
while RecordsFromMarcPlugin reconverts them to MARC::Records.
Test plan:
See second patch.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3c6168d37436b7312e130f796d47271ff2de77cf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 14 10:26:48 2017 -0300
Bug 18331: POST_CHOMP everywhere!
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 14484ba4234fd1cbb925b5f3a4844da863c65d5a
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Aug 8 08:23:57 2017 +0000
Bug 18331: Followup - fix path to orders_by_budget csv header
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 2ee4e0ac381ed23fa23b1117725b2f6a0e0db4de
Author: Lee Jamison <ldjamison at marywood.edu>
Date: Fri Aug 4 19:27:22 2017 +0000
Bug 18331: Followup - Fix CSV export (once and for all!)
Follow-up on Comment 21 to correct the empty_line.inc
include in basket.tt
https://bugs.koha-community.org/show_bug.cgi?id=18331
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 a10e5383016a5cb4117719ac858cbe02a53e457b
Author: Marc Véron <veron at veron.ch>
Date: Thu Aug 3 17:50:30 2017 +0200
Bug 18331: Force tt to insert newline to empty_line.inc
See end of comment #4 and IRC:
http://irc.koha-community.org/koha/2017-08-03#i_1958062
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 8403799c7212349bee70090249e3425afd62423b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jun 12 17:04:47 2017 -0300
Bug 18331: Fix CSV export (once and for all!)
I am going to try and explain the problem here in order to make it a
have-to-read for next changes.
There are several things to test when and most of the time we break
something when we try to fix something else.
You have to test different CSV export, not only one. There are not all
processed the same way. For instance acqui/csv/basket.tt does not
contain any strings to translate and the translate script will copy the
original file as it.
But reports/csv/orders_by_budget.tt will not! Indeed it contains "TOTAL"
which will be translated. The generated tt file for the translated
language will remove all the carriage returns! That's why we cannot rely
on TT for newlines (contrary to bug 16914 assumption).
There are two possible methods:
1/ Fix the translate script
=> Hum... nope
2/ Remove all carriage returns and make them explicit by including an
file that only contains 1 carriage return
This second method is implemented in this patch.
How it works: Use the PRE_CHOMP "[%-" and POST_CHOMP "-%]"
(http://www.template-toolkit.org/docs/manual/Config.html#section_PRE_CHOMP_POST_CHOMP)
to remove all the newlines that could be added by TT in the original
(en) files. Then include the new_line.inc to add a new line.
That way original and translated files will behave the same way.
The BLOCK in the csv_headers avoid to have the newlines added, in any
cases. For instance: by default we will have an empty line at the end of
the headers, but the translated headers will not have it.
Test plan:
At least 2 signoffs will be needed, please test carefully!
You will need to generate CSV with at least 2 entries!
Test with the non-translated interface (en) and with the language you
want. To test with a translated language you will *have to*:
- cd misc/translator
- perl translate update LANG
- manually edit the po file, remove the fuzzy tags, correctly translate
the string (do not forget the additional %s in the headers)
- perl translate install LANG
1/ Export basket and basketgroup as CSV
2/ Export late orders as CSV
3/ Export items (from the item search) as CSV
4/ Export the 2 reports "Orders by fund" and "Cash register" as CSV
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 07c0d968b70421852ac4915633fa7f3cbd0d18cd
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 7 17:55:50 2017 +0000
Bug 16976 - Unit tests
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9c8a04acb05466356fec8e9d6d13183295719c7d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 16 06:36:22 2017 -0400
Bug 16976 - Authorities searches with double quotes gives ZOOM error 20003 [Alternate]
I dug into this a little bit, it seems the issue is that we were double
processing the query because of an extra call to
C4::AuthoritiesMarc::SearchAuthorities
I think we can simply remove this call
To test:
1 - Perform an authority search for a value that returns results
2 - Wrap it in quotes and search
3 - 'Internal server error'
4 - Apply patch
5 - Search with quotes succeeds
https://bugs.koha-community.org/show_bug.cgi?id=16796
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3808dbc1d22b3adc43a09ba7ce00aaca01f95f5a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 7 13:50:32 2017 -0300
Bug 19053: Keep auto_renew flag if a confirmation is needed
If an item is checked out with the auto renewal flag and a confirmation
is needed (holds exist, past due date, etc.) the auto renewal flag will
get lost.
Test plan:
- Check an item out and specify a past due date
- Confirm the checkout on the confirmation screen
=> Without this patch the checkout is not marked as auto renewal
=> With this patch applied the auto renewal flag will be set to the
checkout
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 03c5eb0babc3fd7b0ecf45a8a5db91a67718d3b4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 15 12:16:33 2017 -0300
Bug 18624: Do not return 1 in tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9d7d524f21fbf83ef7e1031e36c9772ffe21db90
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Aug 7 16:23:24 2017 -0300
Bug 18624: (followup) opac-authorities-home.tt uses 'any'
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
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 cfb52579ec2f8859226e0e40f66d5a6d7a2ed73f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 16 09:53:39 2017 -0400
Bug 18624: Run time errors when searching authorities with Elastic search 5.3
It seems we have a syntax mismatch - any vs all
all seems to the be list we expect so updating code that way
To test:
1 - Enabled Elasticsearch
2 - Index some authorities
3 - Perform a 'Search entire record' search
4 - Internal server error (
Invalid marclist field provided: all at
/usr/local/koha/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
line 433.
)
5 - Run:
$ sudo koha-shell kohadev
k$ cd kohaclone
k$ prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
=> FAIL: Tests fail because 'any is used'
6 - Apply patch
7 - Search should work
8 - Run:
k$ prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
=> SUCCESS: Tests pass!
9 Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Edited the test plan so it mentions the new tests
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 b308b0814bcd149e3f899058e693938d982bb425
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Aug 7 16:09:56 2017 -0300
Bug 18624: Regression test for 'any' vs 'all'
This test makes it explicit that the only string producing _all as index on build_authorities_query_compat is 'all'.
To test:
- Apply this patch
- Run:
$ sudo koha-shell kohadev
k$ cd kohaclone
k$ prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
=> FAIL: Test fails because the list of valid values is wrong in Koha.
Note: this list has to be in sync with the templates passing the same values. A followup will be added
to fix a discrepancy found between OPAC and Intranet.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
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 ff41b87302c1b242f9edd7b2e8c253bd18b57ac1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Aug 7 16:07:40 2017 -0300
Bug 18624: Minor refactoring to ease testing
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/ImportBatch.pm | 53 +++++++++---
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 27 +++---
Koha/SearchEngine/Zebra/QueryBuilder.pm | 1 -
basket/basket.pl | 3 +
circ/circulation.pl | 3 +-
debian/docs/koha-create.xml | 10 ++-
debian/scripts/koha-create | 42 +++++++---
.../prog/en/includes/csv_headers/acqui/basket.tt | 2 +-
.../en/includes/csv_headers/acqui/basketgroup.tt | 2 +-
.../en/includes/csv_headers/acqui/lateorders.tt | 2 +-
.../includes/csv_headers/catalogue/itemsearch.tt | 2 +-
.../csv_headers/reports/cash_register_stats.tt | 2 +-
.../csv_headers/reports/orders_by_budget.tt | 2 +-
.../intranet-tmpl/prog/en/includes/empty_line.inc | 1 +
.../prog/en/modules/acqui/csv/basket.tt | 6 +-
.../prog/en/modules/acqui/csv/basketgroup.tt | 10 ++-
.../prog/en/modules/acqui/csv/lateorders.tt | 10 ++-
.../intranet-tmpl/prog/en/modules/basket/basket.tt | 6 +-
.../prog/en/modules/catalogue/itemsearch_csv.tt | 8 +-
.../prog/en/modules/circ/circulation.tt | 7 +-
.../prog/en/modules/members/moremember.tt | 6 +-
.../prog/en/modules/reports/cash_register_stats.tt | 4 +-
.../en/modules/reports/csv/cash_register_stats.tt | 16 ++--
.../en/modules/reports/csv/orders_by_budget.tt | 14 ++--
.../prog/en/modules/tools/stage-marc-import.tt | 20 +----
.../bootstrap/en/modules/opac-authorities-home.tt | 2 +-
members/moremember.pl | 2 -
misc/stage_file.pl | 2 +-
reports/cash_register_stats.pl | 25 +++---
t/00-load.t | 1 -
t/Auth_with_shibboleth.t | 1 -
t/Biblio.t | 1 -
t/Biblio/TransformHtmlToXml.t | 1 -
t/Boolean.t | 1 -
t/Calendar.t | 1 -
t/Charset.t | 2 -
t/Circulation_barcodedecode.t | 1 -
t/Images.t | 1 -
t/Koha.t | 1 -
t/Koha/Config.t | 1 -
t/Koha/Plugin/MarcFieldValues.pm | 86 ++++++++++++++++++++
t/Koha/Util/Normalize.t | 1 -
t/Koha_MetadataRecord.t | 1 -
t/Koha_Template_Plugin_Koha.t | 1 -
t/Letters.t | 1 -
t/Logger.t | 1 -
t/Matcher.t | 1 -
t/Patron.t | 1 -
t/SIP/Sip.t | 1 -
t/SMS.t | 1 -
t/Search.t | 1 -
t/Search/Zebra/QueryBuilder.t | 38 +++++++++
t/SocialData.t | 1 -
t/SuggestionEngine_AuthorityFile.t | 1 -
t/XSLT.t | 1 -
t/db_dependent/Accounts.t | 1 -
t/db_dependent/Auth_with_cas.t | 1 -
t/db_dependent/Auth_with_ldap.t | 1 -
t/db_dependent/Barcodes_ValueBuilder.t | 1 -
t/db_dependent/Biblio.t | 1 -
t/db_dependent/Circulation.t | 2 -
t/db_dependent/Circulation/Branch.t | 1 -
t/db_dependent/Circulation/CheckIfIssuedToPatron.t | 1 -
t/db_dependent/Circulation/CheckValidBarcode.t | 1 -
.../Circulation/GetPendingOnSiteCheckouts.t | 1 -
t/db_dependent/Circulation/IsItemIssued.t | 1 -
t/db_dependent/Circulation/MarkIssueReturned.t | 1 -
.../Circulation/NoIssuesChargeGuarantees.t | 1 -
t/db_dependent/Circulation/Returns.t | 1 -
t/db_dependent/Circulation/StoreLastBorrower.t | 1 -
t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 1 -
t/db_dependent/Circulation/TooMany.t | 1 -
t/db_dependent/Circulation/dateexpiry.t | 1 -
t/db_dependent/Circulation/transfers.t | 1 -
t/db_dependent/Clubs.t | 1 -
t/db_dependent/Context.t | 1 -
t/db_dependent/DecreaseLoanHighHolds.t | 1 -
t/db_dependent/Exporter/Record.t | 1 -
t/db_dependent/Filter_MARC_ViewPolicy.t | 1 -
t/db_dependent/Hold.t | 1 -
t/db_dependent/Holidays.t | 1 -
t/db_dependent/ILSDI_Services.t | 1 -
t/db_dependent/ImportBatch.t | 43 +++++++++-
t/db_dependent/Items/MoveItemFromBiblio.t | 1 -
t/db_dependent/Items_DelItemCheck.t | 1 -
t/db_dependent/Koha/BiblioUtils.t | 1 -
t/db_dependent/Koha/Biblios.t | 1 -
t/db_dependent/Koha/Checkouts.t | 1 -
t/db_dependent/Koha/Cities.t | 1 -
t/db_dependent/Koha/CsvProfiles.t | 1 -
.../Koha/Filter/EmbedItemsAvailability.t | 1 -
t/db_dependent/Koha/IssuingRules.t | 1 -
t/db_dependent/Koha/Item/Transfers.t | 1 -
t/db_dependent/Koha/Items.t | 1 -
t/db_dependent/Koha/Libraries.t | 1 -
t/db_dependent/Koha/MarcSubfieldStructures.t | 1 -
t/db_dependent/Koha/News.t | 1 -
t/db_dependent/Koha/Notices.t | 1 -
t/db_dependent/Koha/Objects.t | 1 -
t/db_dependent/Koha/Patron/Attribute/Types.t | 1 -
t/db_dependent/Koha/Patron/Attributes.t | 1 -
t/db_dependent/Koha/Patron/Categories.t | 1 -
t/db_dependent/Koha/Patron/Images.t | 1 -
t/db_dependent/Koha/Patron/Messages.t | 1 -
t/db_dependent/Koha/Patron/Modifications.t | 1 -
t/db_dependent/Koha/Patrons.t | 1 -
t/db_dependent/Koha/Ratings.t | 1 -
t/db_dependent/Koha/Reviews.t | 1 -
t/db_dependent/Koha/SMS_Providers.t | 1 -
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 55 +++++++++++++
t/db_dependent/Koha/Suggestions.t | 1 -
t/db_dependent/Koha_Elasticsearch.t | 2 -
t/db_dependent/Koha_Elasticsearch_Indexer.t | 2 -
t/db_dependent/Koha_Misc_Files.t | 1 -
.../Koha_SearchEngine_Elasticsearch_Search.t | 1 -
t/db_dependent/Labels/t_Layout.t | 1 -
t/db_dependent/Labels/t_Profile.t | 1 -
t/db_dependent/Labels/t_Template.t | 1 -
t/db_dependent/Members/GetAllIssues.t | 1 -
t/db_dependent/Members/GetPendingIssues.t | 1 -
t/db_dependent/Members/IssueSlip.t | 1 -
t/db_dependent/Passwordrecovery.t | 1 -
t/db_dependent/Patron/Borrower_Discharge.t | 1 -
t/db_dependent/Patron/Borrower_PrevCheckout.t | 1 -
t/db_dependent/Patron/Housebound.t | 1 -
t/db_dependent/Patron/HouseboundProfiles.t | 1 -
t/db_dependent/Patron/HouseboundRoles.t | 1 -
t/db_dependent/Patron/HouseboundVisits.t | 1 -
t/db_dependent/PatronLists.t | 1 -
t/db_dependent/Patrons.t | 1 -
t/db_dependent/QueryParser.t | 1 -
t/db_dependent/RefundLostItemFeeRule.t | 1 -
t/db_dependent/Reserves/GetReserveFee.t | 1 -
t/db_dependent/Reserves/MultiplePerRecord.t | 1 -
t/db_dependent/RotatingCollections.t | 1 -
t/db_dependent/SIP/SIPServer.t | 1 -
t/db_dependent/Search.t | 1 -
t/db_dependent/Serials/ReNewSubscription.t | 1 -
t/db_dependent/Template/Plugin/Categories.t | 1 -
t/db_dependent/Templates.t | 1 -
t/db_dependent/Utils/Datatables_Members.t | 2 -
t/db_dependent/Utils/Datatables_Virtualshelves.t | 1 -
t/db_dependent/api/v1/cities.t | 1 -
t/db_dependent/db_structure.t | 1 -
t/db_dependent/www/auth_values_input_www.t | 1 -
t/db_dependent/www/batch.t | 1 -
t/db_dependent/www/history.t | 1 -
t/db_dependent/www/search_utf8.t | 1 -
tools/stage-marc-import.pl | 10 ++-
xt/author/icondirectories.t | 2 -
150 files changed, 400 insertions(+), 244 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/empty_line.inc
create mode 100644 t/Koha/Plugin/MarcFieldValues.pm
create mode 100644 t/Search/Zebra/QueryBuilder.t
create mode 100644 t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list