[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.05-74-gfc4ee4a
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 27 15:52:57 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, 17.05.x has been updated
via fc4ee4aeec28c0f99e8432d4ce7748b7f628d85c (commit)
via 448c1206f82c039fa90c8ad480c384a578f39acb (commit)
via 23c8acd61590de50bcfa2779afc35fb7d5dd6488 (commit)
via 96143e8d9e62a0565c996d5fd071b7a9d0407019 (commit)
via 7453b2c5d8ed7c570e683b1d71712695d0576dcf (commit)
via 3e45ba75e95c8e9ad4d20c0043c5530bbce5f018 (commit)
via 40c444cc2bd664babd30ca4ed70c4953cfb916d5 (commit)
via 6d90376e7b75f27a6a0b33e01efa04da68c18a9a (commit)
via ec06d9daa836005470c47d40ec2eba8d86910895 (commit)
via 958e6b712216dae3011ddcc93780859bcfd791f7 (commit)
from 1a99731640eb9e500221ffb838677f1eb7aa369d (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 fc4ee4aeec28c0f99e8432d4ce7748b7f628d85c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 6 12:30:18 2017 -0300
Bug 19423: Prevent DecreaseLoanHighHolds.t to fail randomly
CanBookBeIssued returns STATS if categorycode is X
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 090b450a502340e3d03b5ee6a075cc92e647aada)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 448c1206f82c039fa90c8ad480c384a578f39acb
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Aug 28 16:27:41 2017 +0000
Bug 19193: When displaying the fines of the guarantee on the guarantor account, price is not in correct format
1 - Have a patron with guarantees
2 - Charge some fines to the guarantees
3 - View the patron
4 - Fines are displayed unformatted
5 - Apply patch
6 - Refresh
7 - Fines should now be formatted correctly
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.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>
(cherry picked from commit 0d124e1bc322e6823c192c51effa0f3eecb2ac1f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 23c8acd61590de50bcfa2779afc35fb7d5dd6488
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Nov 21 12:08:52 2016 -0500
Bug 17664: Silence non-zebra warnings in t/db_dependent/Search.t
TEST PLAN
---------
0) back up database
1) drop database; create database
2) run web installer
3) prove t/db_dependent/Search.t
-- the spammy warnings (other than zebra index warnings) may
already be fixed, but the mocked value was not realistic.
4) apply patch
5) prove t/db_dependent/Search.t
-- notice only zebra index warnings.
6) run qa test tools
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 5e63a3838102ee1fe8a1bc15640196ab611dbc89)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 96143e8d9e62a0565c996d5fd071b7a9d0407019
Author: David Bourgault <david.bourgault at inlibro.com>
Date: Tue Sep 19 13:37:54 2017 -0400
Bug 19345: Add missing error flag to template
Adds a missing error flag to the template->param { } call.
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>
(cherry picked from commit 078eb77451dacd6042b783edf6f89f5ab95732b5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 7453b2c5d8ed7c570e683b1d71712695d0576dcf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 2 14:22:27 2017 -0300
Bug 19398: Format date of birth in circ patron search
When searching for a patron from the circulation tab, the results table
shows the date of birth unformatted.
Test plan:
Apply this patch, search for patrons in the circ tab and confirm that
the date of birth are correctly formatted according to the dateformat
syspref
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>
(cherry picked from commit 4edfc7900f6132c6771e4cfc820a5a3dc08d3e13)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3e45ba75e95c8e9ad4d20c0043c5530bbce5f018
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Oct 6 11:39:42 2017 +0200
Bug 19386: [QA Follow-up] Remove some default values
In the meantime bug 19403 added default nulls for gonenoaddress, lost
and debarred. So these lines can be removed safely.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 12a754a703bc8f4279bb23aab09c39c0514b0a75)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 40c444cc2bd664babd30ca4ed70c4953cfb916d5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 28 17:31:04 2017 -0300
Bug 19386: Prevent t/db_dependent/SIP/Patron.t to fail randomly
Depending on the values used by TestBuilder, some tests from t/db_dependent/SIP/Patron.t can fail
# Failed test 'Not blocked without overdues when set to 'Don't block''
# at t/db_dependent/SIP/Patron.t line 55.
# got: '0'
# expected: '1'
# Failed test 'Not blocked without overdues when set to 'confirmation''
# at t/db_dependent/SIP/Patron.t line 61.
# got: '0'
# expected: '1'
# Failed test 'Not blocked without overdues when set to 'Block''
# at t/db_dependent/SIP/Patron.t line 67.
# got: '0'
# expected: '1'
Caused by this check in C4::SIP::ILS::Patron->new
110 for (qw(EXPIRED CHARGES CREDITS GNA LOST DBARRED NOTES)) {
111 ($flags->{$_}) or next;
[...]
115 if ($flags->{$_}->{noissues}) {
116 foreach my $toggle (qw(charge_ok renew_ok recall_ok hold_ok inet)) {
117 $ilspatron{$toggle} = 0; # if we get noissues, disable everything
118 }
119 }
120 }
Test plan:
Execute several times (50x?) these tests.
Without this patch they may fail
With this patch they must never fail
Signed-off-by: David Bourgault <david.bourgault at inlibro.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>
(cherry picked from commit 6545cfe3f30789723b6f3c2e6e13af6e6c8e5fb9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 6d90376e7b75f27a6a0b33e01efa04da68c18a9a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 3 19:20:18 2017 -0300
Bug 19405: Prevent api/v1/holds.t to fail randomly
DBD::mysql::st execute failed: Duplicate entry 'cEMggO40gdPLhcVXbpry8x0izO8lHr8NafFIBJwm0D1HgiXA57YR0a0VVxhQBzvn' for key 'userid' [for Statement "INSERT INTO `borrowers` ( `branchcode`, `categorycode`, `flags`, `surname`, `userid`) VALUES ( ?, ?, ?, ?, ? )" with ParamValues: 0='N2ElsY9', 1='Kk8G', 2=80, 3='Test Surname', 4='cEMggO40gdPLhcVXbpry8x0izO8lHr8NafFIBJwm0D1HgiXA57YR0a0VVxhQBzvnnbgezJqmxqwz'] at /usr/share/perl5/DBIx/Class/Storage/DBI.pm line 1832.
DBIx::Class::Storage::DBI::_dbh_execute(): Duplicate entry 'cEMggO40gdPLhcVXbpry8x0izO8lHr8NafFIBJwm0D1HgiXA57YR0a0VVxhQBzvn' for key 'userid' at /kohadevbox/koha/Koha/Object.pm line 121
[18:52:19] t/db_dependent/api/v1/holds.t
Reading the code I guess it happens if TestBuilder generates a userid with the size of borrowers.userid (75 chars). In that case the following lines are wrong:
$borrower->userid($nopermission->{ userid }."z");
$borrower2->userid($nopermission->{ userid }."x");
$borrower3->userid($nopermission->{ userid }."y");
The 3 patrons will have the same userid.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit a1bf319829c9d44991daa2fcf2593420f8445c5b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit ec06d9daa836005470c47d40ec2eba8d86910895
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 3 14:16:02 2017 -0300
Bug 19403: Prevent Circulation.t to fail randomly
Due to the number of test cases handle by CanBookBeIssued, Circulation.t
fails randomly. To prevent that it is better to set some values.
For instance if the patron is a statistical patron (category_type=X),
the subroutine will return a STATS flag.
This patch also adds a subroutine to the test file to display the keys
of $error, $question and $alert set by CanBookBeIssued.
It will be easier to track other random failures.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit cb26219903c30ee6acce926d4a1bb6152f35668c)
commit 958e6b712216dae3011ddcc93780859bcfd791f7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 3 14:15:47 2017 -0300
Bug 19403: Add some default values when building patrons for test
To avoid some tests to fail randomly
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 0b0059afb42aca25a3d10dfb372c2b26adcd6e41)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/QueryParser/Driver/PQF/query_plan/node.pm | 2 +-
.../en/includes/circ-patron-search-results.inc | 3 +-
.../prog/en/modules/circ/circulation.tt | 2 +-
opac/opac-password-recovery.pl | 1 +
t/db_dependent/Circulation.t | 90 +++++++++++---------
t/db_dependent/DecreaseLoanHighHolds.t | 5 +-
t/db_dependent/SIP/Patron.t | 18 +++-
t/db_dependent/Search.t | 2 +-
t/db_dependent/api/v1/holds.t | 89 ++++++++++---------
t/lib/TestBuilder.pm | 4 +
10 files changed, 126 insertions(+), 90 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list