[koha-commits] main Koha release repository branch 19.11.x updated. v19.11.04-135-g60c88bfa2f
Git repo owner
gitmaster at git.koha-community.org
Sat Apr 4 01:07:32 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, 19.11.x has been updated
via 60c88bfa2f6c23c58ebd953eca2d0c29f6f2dee3 (commit)
via 0a6c345703d46f4da4714dd5fa9ae673fab94ec6 (commit)
via d3d27f48d8672a5d5f679647a7265ba1fd9bb11e (commit)
via 8b3a134435471686c1564f2bc6ee6d3e187fdd06 (commit)
from 88590cb6784d0b774f48aac9db491d0d32cf6d8a (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 60c88bfa2f6c23c58ebd953eca2d0c29f6f2dee3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 27 17:09:27 2020 +0100
Bug 24614: Fix Reports/Guided.t
DBD::mysql::st execute failed: Column 'public' cannot be null [for Statement "UPDATE `saved_sql` SET `last_modified` = ?, `notes` = ?, `public` = ?, `report_group` = ?, `report_name` = ?, `report_subgroup` = ?,
`savedsql` = ? WHERE ( `id` = ? )" with ParamValues: 0='2020-03-27T16:03:04', 1=undef, 2=undef, 3=undef, 4='Just another report', 5=undef, 6=undef, 7=25] at /usr/share/perl5/DBIx/Class/Storage/DBI.pm line 1836.
# Looks like you planned 17 tests but ran 6.
update_sql expect all the paramters to be set, otherwise it will be
nulled.
The best way to fix it is at test level. There is only 1 occurrence in
controller/module, and it sends all the parameters. That is the correct
way to do and will make things easier when we will removed them to use
Koha::Reports directly
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 0a6c345703d46f4da4714dd5fa9ae673fab94ec6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 11 17:21:38 2020 +0100
Bug 24614: Use Koha::Reports from save_report and update_sql
In order to get the default value defined at DBMS level, we use
Koha::Reports (to inherit from Koha::Object->store) from the 2 add/edit
methods of C4::Reports::Guided.
A second step would be to remove completely those CRUD subroutines and
use directly Koha::Reports instead.
Test plan:
1. Add and edit some reports
2. Disable memcached, create a report, edit it
=> Should not crash
3. Make sure the tests make sense and that they pass after the second
patch.
The error was:
DBD::mysql::db do failed: Column 'cache_expiry' cannot be null [for
Statement "UPDATE saved_sql SET savedsql = ?, last_modified = now(),
report_name = ?, report_group = ?, report_subgroup = ?, notes = ?,
cache_expiry = ?, public = ? WHERE id = ? "] at
/kohadevbox/koha/C4/Reports/Guided.pm line 633.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit d3d27f48d8672a5d5f679647a7265ba1fd9bb11e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 11 17:21:15 2020 +0100
Bug 24614: Add tests
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 8b3a134435471686c1564f2bc6ee6d3e187fdd06
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 9 09:33:54 2020 -0400
Bug 24829: ClaimReturnedWarningThreshold is always triggered if patron has one or more claims
ClaimReturnedWarningThreshold is supposed to display a warning if a patron has more than the number of claims specified in the system preference. Currently the warning is displayed for any number of claims over zero.
Test Plan:
1) Make 3 return claims for a patron
2) Set ClaimReturnedWarningThreshold to 4
3) Note the claims warning displays for the patron on circulation.pl
4) Apply this patch
5) Reload circulation.pl, the warning should go away
6) Set ClaimReturnedWarningThreshold to 2
7) Reload the page, the warning should reappear
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reports/Guided.pm | 43 ++++++++++++++++------
.../prog/en/modules/circ/circulation.tt | 2 +-
t/db_dependent/Reports/Guided.t | 6 ++-
3 files changed, 37 insertions(+), 14 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list