[koha-commits] main Koha release repository branch master updated. v19.11.00-476-g8a468824fd
Git repo owner
gitmaster at git.koha-community.org
Fri Jan 24 16:46:23 CET 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 8a468824fd32d96af9e43c26635491d6579c19e2 (commit)
via 0c404e0529ace3ac2eee218c1d0451ace8cea857 (commit)
via dc419ab2a9e7f3c49934272161597d903c24ea95 (commit)
via c3e96a900b5ab0ed12e6e58d29ed2b13ce31716d (commit)
via 3d388167698dbd43d42e1b0f83b435620d341cd8 (commit)
via 00020bdfa9614b5627303fbd095e32b5cb5384b8 (commit)
via 6a2223356bd332d666863cb9a75aad4c43c28b71 (commit)
via 518bb04d8a56edceeada645755de69530844f435 (commit)
via 78ac663aa7947dd873ebdc748ff3e0abb0ed6823 (commit)
via f8894fcba9e512d9e03d5bcbb6facd934885112c (commit)
via 9654dd74ff4317f1113c6589b2bed9eb6dc446e5 (commit)
via 7c2319f8070ee00c2cd1b2042754d9ad3b06bdc7 (commit)
via 703fc7ad6363f09297c37152c49752630d8cb73d (commit)
via 80f1374f262544a750b5d81a7d9605c8708c53b1 (commit)
from 2ee96d2abd9037723a8e844d1d6ed1c1c3a0c556 (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 8a468824fd32d96af9e43c26635491d6579c19e2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jan 24 09:16:09 2020 -0300
Bug 24509: Fix API relared tests failing on MySQL8
This patch makes a trivial change to the tests so they catch the way
MySQL 8 reports the duplicate key message. The difference on the API
error message is irrelevant and so it is ok to just make the tests try
both MySQL 8 output and the rest of the supported engines.
To test:
1. Run:
$ kshell
k$ prove t/db_dependent/api/v1/acquisitions_orders.t \
t/db_dependent/api/v1/libraries.t \
t/db_dependent/api/v1/patrons.t
=> FAIL: Tests fail due to warning and conflict message differences
2. Apply this patch
3. Repeat 1
=> SUCCESS: Tests pass!
4. Sign off :-D
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 0c404e0529ace3ac2eee218c1d0451ace8cea857
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 24 11:13:53 2020 +0100
Bug 24507: Make Checkouts/ReturnClaim.t pass on MySQL 8
$ prove t/db_dependent/Koha/Checkouts/ReturnClaim.t
t/db_dependent/Koha/Checkouts/ReturnClaim.t ..
# Failed test 'Exception field is correct'
# at t/db_dependent/Koha/Checkouts/ReturnClaim.t line 97.
# got: 'return_claims.issue_id'
# expected: 'issue_id'
# Looks like you failed 1 test of 8.
t/db_dependent/Koha/Checkouts/ReturnClaim.t .. 1/1
# Failed test 'store() tests'
# at t/db_dependent/Koha/Checkouts/ReturnClaim.t line 133.
This is similar to bug 23825.
Test plan:
Confirm that the tests pass on MySQL8 and MariaDB
Signed-off-by: Tomás Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dc419ab2a9e7f3c49934272161597d903c24ea95
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 24 11:17:15 2020 +0000
Bug 24305: (QA follow-up) Strip table name in [[table.field|alias]]
When you would use the construct, you wont have batch features unless
we strip the table name. This is consistent with the $sth->{NAME} used
to fill the headers by default.
Test plan:
Use [[items.biblionumber|bibno]] instead of items.biblionumber in a
reporting query.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c3e96a900b5ab0ed12e6e58d29ed2b13ce31716d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 24 11:04:05 2020 +0000
Bug 24305: (follow-up) Add small comment for square brackets in get_prepped_report
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3d388167698dbd43d42e1b0f83b435620d341cd8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 13 12:15:33 2020 +0100
Bug 24305: Remove previous declaration of batch_biblionumbers
We should not init batch_biblionumbers before.
Also this patch deals with batch_cardnumbers.
Signed-off-by: Holly Cooper <hc at interleaf.ie>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 00020bdfa9614b5627303fbd095e32b5cb5384b8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 26 11:11:55 2019 +0100
Bug 24305: Fix links to batch tools when report's columns do not contain integers
If report's columns do not only contain integers, we should not point to
batch tools.
For instance, if the value is a link, the batch tools will not work as
they will not retrieve the id (itemnnumber or biblionumber) properly
Test plan:
Create a report like:
SELECT CONCAT('<a href=\"/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=', biblionumber, '&itemnumber=', itemnumber, '#edititem', '\">', itemnumber, '</a>' ) AS itemnumber
FROM items
LIMIT 10;
Execute it
=> There is not link to the batch tools
Edit the report like:
SELECT itemnumber
FROM items
LIMIT 10;
Execute it
=> There is a link to the batch tools
Edit the report like
SELECT itemnumber, CONCAT('<a href=\"/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=', biblionumber, '&itemnumber=', itemnumber, '#edititem', '\">', itemnumber, '</a>' ) AS itemnumber
FROM items
LIMIT 10;
Execute it
=> There is link to the batch tools
Try other combinations with biblionumber.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6a2223356bd332d666863cb9a75aad4c43c28b71
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Jan 24 09:20:06 2020 +0100
Bug 24503: fix missing use in value builder barcode_manual.pl
Bug 22721 added use C4::Biblio in cataloguing/value_builder/barcode.pl.
This is missing in value builder barcode_manual.pl.
You get the error :
Undefined subroutine &Koha::FrameworkPlugin::GetMarcFromKohaField called at cataloguing/value_builder/barcode_manual.pl line 41.
Test plan :
1) Configure a subfield of item to use value builder barcode_manual.pl
2) Go to a record
3) Try to add a new item
4) Check the value builder is OK
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested with autobarcode==year-0001,0002
No internal server error, but generates a barcode now.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 518bb04d8a56edceeada645755de69530844f435
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 14 12:39:38 2020 +0100
Bug 23443: Do not checkin an item if checked out to another patron when lost fee is paid
Test plan:
0 - Do not apply this patch
1 - Check out an item to a patron
2 - Make sure a fee will be charged when lost
3 - Mark the item lost
4 - Make sure the fee will not be refunded on return of the item
5 - Return the item
6 - Check it out to a new patron
7 - Write off the fine for the original patron
=> The item is now checked in
8 - Apply this patch and repeat 1 to 7
=> The item is still checked out
Signed-off-by: Andrew Fuerste-Henry <andrew 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 78ac663aa7947dd873ebdc748ff3e0abb0ed6823
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 14 12:39:36 2020 +0100
Bug 23443: Add tests
Signed-off-by: Andrew Fuerste-Henry <andrew 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 f8894fcba9e512d9e03d5bcbb6facd934885112c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 24 07:22:52 2020 +0000
Bug 23407: (QA follow-up) Same change for UNIMARC XSLT
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9654dd74ff4317f1113c6589b2bed9eb6dc446e5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 24 07:12:31 2020 +0000
Bug 23407: (QA follow-up) Remove some XSLT item leftovers
Test plan:
Check intranet results and detail page.
Check opac detail.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7c2319f8070ee00c2cd1b2042754d9ad3b06bdc7
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jul 31 20:14:34 2019 +0000
Bug 23407: Don't process items for XSLT on details pages
To test:
1 - Add 1000 items to a record
Go to biblio
Edit items
Add multiple copies of this item
Add 1000 and confirm
Wait..
2 - Load the record in staff client and OPAC, note how long it takes
Press F12 in browser to open the console
use the Network tab of the console
note the load time
refresh a few times to see average time
3 - Apply patch
4 - Restart all the things
5 - Reload the record in staff and opac
6 - Note decresed time
7 - Verify nothing on the page has changed
QA can grep the standard XSLT files for details pages for 'item' to note occurences do not use items information
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 703fc7ad6363f09297c37152c49752630d8cb73d
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Jan 17 10:48:50 2020 +0100
Bug 24443: Unit test
Signed-off-by: Maryse Simard <maryse.simard at inlibro.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 80f1374f262544a750b5d81a7d9605c8708c53b1
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Jan 17 10:25:19 2020 +0100
Bug 24443: Consider NULL as 0 for issues in items search
In items search, we can filter by items issues count, data coming from items.issues.
Most of the time, for an item with no issues this column contains NULL.
This enhancement proposes to consider NULL as 0 to allow searching items with no issues.
Test plan:
1) Use SQL to count items with items.issues = NULL :
select count(*) from items where issues is null;
2) Go to items search
3) Perform search with filter "Checkout count" = 0
4) Check you get the same number of results as SQL query
Signed-off-by: Maryse Simard <maryse.simard at inlibro.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/Circulation.pm | 3 ++
C4/Items.pm | 3 ++
C4/XSLT.pm | 7 +++-
cataloguing/value_builder/barcode_manual.pl | 1 +
.../en/modules/reports/guided_reports_start.tt | 16 +++++---
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 3 +-
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 6 +--
.../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 3 +-
.../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 5 +--
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 3 +-
.../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 3 +-
reports/guided_reports.pl | 4 ++
t/db_dependent/Items.t | 22 ++++++++++-
t/db_dependent/Koha/Account.t | 45 +++++++++++++++++++++-
t/db_dependent/Koha/Checkouts/ReturnClaim.t | 4 +-
t/db_dependent/api/v1/acquisitions_orders.t | 4 +-
t/db_dependent/api/v1/libraries.t | 4 +-
t/db_dependent/api/v1/patrons.t | 8 ++--
18 files changed, 109 insertions(+), 35 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list