[koha-commits] main Koha release repository branch master updated. v19.11.00-32-gea7311f
Git repo owner
gitmaster at git.koha-community.org
Tue Dec 10 17:42:33 CET 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, master has been updated
via ea7311fedfc8e3e031b4f387c148b158b82e5db0 (commit)
via 741b9a1c73ce366b02016a8bc80b5c01d5712c07 (commit)
via 2a169e94cdabf77098425b8bccfbbfa4b0fdf926 (commit)
via 704ea1a62ea2d80361545101129eb3725e3fe99a (commit)
via fc72ce1a5fcc002b0e1b0e399d66b2ac8afdcf51 (commit)
via 20a8cac651a2844bc8e16e751ef2c81193d0607e (commit)
via 9c35a5418226f5771be91a8c3ed17f7c56751b81 (commit)
via b6206a3e23a9a933a8981c587e15aa268f5fb331 (commit)
via 13323c328596e8aa173ea18c7719d16ccd6866c4 (commit)
via 9325e6b6989baab9e3b072d397a3bea277eb7cd5 (commit)
from b022b37db75e468cc56f3189b2f284f03e81ca2d (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 ea7311fedfc8e3e031b4f387c148b158b82e5db0
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Dec 9 15:31:36 2019 -0300
Bug 24191: Make objects.search pass to_model to dbic_merge_sorting
This patch makes objects.search pass the to_mode method reference so it
can be used to map API attributes to column names when building the
sorting portion of the query.
To test:
1. Apply the regression tests on this patchset
2. Run:
$ kshell
k$ prove t/db_dependent/Koha/REST/Plugin/Objects.t
=> FAIL: Tests fail!
3. Apply the rest of the patchset
4. Run:
k$ prove t/Koha/REST/Plugin/Query.t
=> SUCCESS: Tests pass! changes to the methods work as expected!
5. Run:
k$ prove t/db_dependent/Koha/REST/Plugin/Objects.t
=> SUCCESS: Tests pass!
6. Sign off :-D
Sponsored-by: ByWater Solutions
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 741b9a1c73ce366b02016a8bc80b5c01d5712c07
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Dec 9 14:48:48 2019 -0300
Bug 24191: Add to_model param to _build_order_atom and dbic_merge_sorting
This patch adds a to_model parameter to dbic_merge_sorting so it is
passed when used (for example from objects.search). The to_model param
is passed along to the _build_order_atom method where it is finally
used.
In the process I wrote tests that reflected some problems in the current
code:
- Mojolicious automatically returns a scalar if a query parameter only
happens once on a request. The code expected an arrayref in every case.
- There's a design issue that forced me to use some hacky code in
_build_order_atom.
The first issue is dealth with, by using Scalar::Util::reftype as the
Perl docs recommend.
The second issue, I don't plan to clean it here, as there's ongoing work
on a Koha::Objects->search_from_api method that will obsolete this code
most probably (see bug 23893 for a better picture of where the mappings
will be living soon).
To test:
1. Apply this patch
2. Run:
$ kshell
k$ prove t/Koha/REST/Plugin/Query.t
=> SUCCESS: Tests pass!!
3. Sign off :-D
Sponsored-by: ByWater Solutions
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2a169e94cdabf77098425b8bccfbbfa4b0fdf926
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Dec 9 14:41:35 2019 -0300
Bug 24191: Regression tests
This patch adds missing tests for calling objects.search with
non-existent column names for sorting, that should be mapped using
to_model for that matter.
Tests should fail as there's no current use of to_model for building the
order_by portion of the query.
Sponsored-by: ByWater Solutions
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 704ea1a62ea2d80361545101129eb3725e3fe99a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 29 14:45:25 2019 +0100
Bug 24138: Fix calculation of suspension days when a limit is set
If there is a limit for the number of suspension days
(maxsuspensiondays), the calculation is wrong. We are reducing the
number of days before taking into account the suspension charging
interval.
For instance, a checkin is 1 year late and the circ rules are defined to
charge 7 days every 15 days.
It results in 365 * 7 / 15 days of suspension => 170 days
Before this patch the calculation was:
365 * 7 limited to 333, 333 / 15 => 22 days
Test plan:
Given the examples in the commit messages and the description of the bug
report, setup complex circulation rules and confirm that the debarment
dates are calculated correctly
Signed-off-by: Hugo Agud <hagud at orex.es>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fc72ce1a5fcc002b0e1b0e399d66b2ac8afdcf51
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 29 13:55:27 2019 +0100
Bug 24138: Move the calculation out of the sub
No changes expected here. For the next patch we are going to need to add
test and calculate the new debarment date. To ease the writing of these
tests the calculation is moved out of the existing subroutine.
Signed-off-by: Hugo Agud <hagud at orex.es>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 20a8cac651a2844bc8e16e751ef2c81193d0607e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 25 13:35:25 2019 +0100
Bug 23970: Make search with "Publication date" field work at any position
The changes made in the following commit:
commit 0d2e83bca5b91376e9262b6cb0b993f09b919018
Bug 14636: Item search - fix search and sort by publication date for MARC21
was put at the wrong place. It was inside a "if $i == 1" test that
impacts the first field only.
Test plan:
0/ Use a MARC21 installation
1/ Search items by publication date, use twice the field using different
values.
For instance:
publication date: 2005 OR
publication date: 2006
=> Without this patch you only get results for 2005
=> With this patch applied you get results for both years.
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9c35a5418226f5771be91a8c3ed17f7c56751b81
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 10 10:50:58 2019 +0100
Bug 21761: Do not call $self->store in ->set_password
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b6206a3e23a9a933a8981c587e15aa268f5fb331
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jun 21 16:47:55 2019 +0100
Bug 21761: Call set + store as update
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 13323c328596e8aa173ea18c7719d16ccd6866c4
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Dec 10 11:44:44 2019 -0300
Bug 24177: (QA follow-up) Fix warning
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9325e6b6989baab9e3b072d397a3bea277eb7cd5
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Dec 10 07:56:55 2019 +0000
Bug 24177: Import Koha::Account::CreditTypes to cash_register_stats.pl
Test plan:
0) Do not apply the patch
1) Confirm the bug - go to Reports -> Cash register
--> You will see ISE
2) Apply the patch, and restart_all
3) Confirm the ISE is gone and you see the form for Cash register report
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 142 +++++++++++---------
Koha/Object.pm | 13 +-
Koha/Patron.pm | 10 +-
Koha/REST/Plugin/Objects.pm | 3 +-
Koha/REST/Plugin/Query.pm | 30 +++--
catalogue/itemsearch.pl | 7 +-
reports/cash_register_stats.pl | 5 +-
t/Koha/REST/Plugin/Query.t | 51 ++++++-
.../Circulation/IssuingRules/maxsuspensiondays.t | 57 +++++++-
t/db_dependent/Koha/REST/Plugin/Objects.t | 43 +++++-
10 files changed, 273 insertions(+), 88 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list