[koha-commits] main Koha release repository branch master updated. v19.11.00-1032-ga8964a2dc4
Git repo owner
gitmaster at git.koha-community.org
Fri Mar 6 11:35:17 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 a8964a2dc4dd28844ef5def509427a8b259b4980 (commit)
via 7d2a5ef86528679bb5ad8c10cf526c203cddd9c9 (commit)
via cc8f2cb50d39bf66a0480b57597a4d081145c3a8 (commit)
via 2ba1493e2e8b48a4ca277ed2cea3f31d54c9e45d (commit)
via a2449a81be55aa5b3710ca2c6df7884513f89540 (commit)
via d26a10c1fedf55a7e85387e6555601e41db0e043 (commit)
via 5f853ca1179ab4c69262d65370e0a6f51764dc47 (commit)
via 5d30f378b2e55072af680681930bb3cd1a79fb44 (commit)
via be31436e858347a3ea1e4d3047368233fea6e0b5 (commit)
via 7d23692511c4203736f63aa56d66492d9fdfaeef (commit)
via 3aa52a4bf6e1fe7d94504f1eca384d4a4836d4ee (commit)
via c2f1106f2e026fe6860e7e4df470540ce3e37405 (commit)
via 2eebecfb621d0124b0b8be868c6d2a4fe959a9f7 (commit)
via c77e64de1ea64239e64e8479527f2b023adb5189 (commit)
via 2cc6c709c1d106800cee6bfe257a88a741d3f319 (commit)
via 0fcbec7507a4117a7389d8bcebffed57db3a477c (commit)
from 8b003f4b73a4e1ff8c21e2e6ac6f75b3abe3ba04 (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 a8964a2dc4dd28844ef5def509427a8b259b4980
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Mar 6 10:08:55 2020 +0000
Bug 23051: DBRev 19.12.00.037
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7d2a5ef86528679bb5ad8c10cf526c203cddd9c9
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Mar 5 10:26:38 2020 +0000
Bug 23051: (follow-up) Remove call to GetFines
As mentioned by Nick in comment #69 and subsequently discussed on Slack,
the call to GetFines in renew_item was unnececcesary. It has now been
removed.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit cc8f2cb50d39bf66a0480b57597a4d081145c3a8
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Mar 4 15:11:23 2020 +0000
Bug 23051: (follow-up) Fix renew summary display
As mentioned in comment #69:
>staff client does unless I click 'pay' next to the individual fine
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2ba1493e2e8b48a4ca277ed2cea3f31d54c9e45d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Mar 4 13:25:48 2020 +0000
Bug 23051: (QA follow-up) Missing curly and tabs and fix test
Some rebase issues, accounttype no longer exists, circ rules make
CanBookBeRenewed fail, so we mock that too
interface must be passed as a hashref
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a2449a81be55aa5b3710ca2c6df7884513f89540
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Oct 9 15:13:54 2019 +0100
Bug 23051: (follow-up) Add renewal feedback and move code to subroutines and test
Rebasing was a nightmare, so I'm squashing the sign off follow-ups to
ease the pain with any future rebases
Includes:
Bug 23051: (follow-up) Refactor renewal code
As per Nick's first point in comment #20, the code that tests for
renewability and renews items has been refactored into it's own
function.
Bug 23051: (follow-up) Provide feedback
For renewals that fail when a fine is being paid off, this patch causes
any errors to be passed back to the template for display.
Addresses the second point in Nick's comment #20
Bug 23051: (follow-up) Fix unit tests
As raised by Nick in comment #35
Bug 23051: (follow-up) Fix/improve feedback
This follow up patch addresses the following parts of Nick's feedback in
comment #35:
- it would be nice to get feedback on what was successfully renewed as well
- In general I think I would prefer to see 'ok' and 'not_ok' returned as
a single 'renewal_results' array
- There is no listing of errors if I use the 'pay' button on an
individual fine
Bug 23051: (follow-up) Refactor methods
This follow up patch addresses the following parts of Nick's feedback in
comment #35:
- I don't really like that the functions are internal functions and then
exported
- I think the pref description should highlight that if 'RenewalPeriodBase'
is set to due date, there may be doubled charges
Bug 23051: (follow-up) Add SIP summary
This follow up patch addresses the following parts of Nick's feedback in
comment #35:
- Ideally SIP would get feedback in a screen message
Bug 23051: (follow-up) Renewing in OPAC
This follow up patch addresses the following parts of Nick's feedback in
comment #35:
- I am also not sure about the code path if a patron paid fines on the
opac (via paypal etc.) but renewals are not allowed on the opac.
We've introduced the syspref RenewAccruingItemInOpac (default is off)
which, when enabled, will cause items attached to fines that are paid
off in the OPAC (via payment plugins), to be automatically renewed.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d26a10c1fedf55a7e85387e6555601e41db0e043
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Tue Jun 11 14:17:17 2019 +0100
Bug 23051: Renew items when fines paid off
When the RenewAccruingItemWhenPaid syspref is enabled and all the fines
on an item that is accruing fines are paid, we automatically renew that
item to prevent it from starting to accrue fines again.
This patch adds an additional argument to C4::Circulation::AddRenewal
which allows us to skip the calculation of fines upon renewal, which we
don't want to do if the fines on that item have just been paid. Existing
calls to AddRenewal have not been amended because there seems to be a
convention of only passing undef when adding arguments that require
their positioning to be maintained. Since the new argument is the last
one, this is not the case with any existing call.
Sponsored-by: Loughborough University
Signed-off-by: Lucy Harrison <L.M.Harrison at lboro.ac.uk>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5f853ca1179ab4c69262d65370e0a6f51764dc47
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Jun 12 15:18:54 2019 +0100
Bug 23051: Add unit tests
This patch adds unit tests for all modules affected by this bug
Sponsored-by: Loughborough University
Signed-off-by: Lucy Harrison <L.M.Harrison at lboro.ac.uk>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5d30f378b2e55072af680681930bb3cd1a79fb44
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Jun 5 14:38:07 2019 +0100
Bug 23051: Add RenewAccruingItemWhenPaid syspref
This patch adds the new syspref "RenewAccruingItemWhenPaid"
Sponsored-by: Loughborough University
Signed-off-by: Lucy Harrison <L.M.Harrison at lboro.ac.uk>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit be31436e858347a3ea1e4d3047368233fea6e0b5
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Feb 4 08:01:06 2020 +0100
Bug 24573: Add missing dependencies to cpanfile
When using Elasticsearch, Catmandu::Store::ElasticSearch is required for
search, and Catmandu::MARC is required for indexation
Signed-off-by: Michal Denar <black23 at gmail.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 7d23692511c4203736f63aa56d66492d9fdfaeef
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 5 16:27:15 2020 +0100
Bug 24813: Prevent api/v1/holds.t to fail randomly
Hold cannot be suspended if found=W:
Koha::Hold->suspend_hold
90 if ( $self->is_found ) { # We can't suspend found holds
So when TestBuilder generate a hold with found=W the test fail.
A question however:
Why did not we have the correct exception displayed somewhere? That
would be much more helpful to find the problem!
Signed-off-by: David Nind <david at davidnind.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 3aa52a4bf6e1fe7d94504f1eca384d4a4836d4ee
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Feb 25 18:08:59 2020 +0000
Bug 24713: JavaScript error on staff client catalog search results page
This patch modifies the output of template toolkit variables so that
values in the in-page JavaScript are quoted. This avoids JavaScript
errors when the template variable is empty.
To test, apply the patch and perform a catalog search in the staff
client. Use the browser's developer tool to check for JavaScript errors
in the console. There should be none.
Test with AmazonCoverImages both on and off.
Signed-off-by: David Nind <david at davidnind.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 c2f1106f2e026fe6860e7e4df470540ce3e37405
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Mar 4 12:08:29 2020 -0500
Bug 24802: Updating holds can cause suspensions to apply to wrong hold
On request.pl, the table of holds shows a suspend_until date picker for each hold, *unless* that hold is waiting or in transit. The script reserve/modrequest.pl assumes that there will be a suspend_until input for each hold, but that is incorrect. Assume there are 20 holds on a record, and 10 of them are waiting or in transit. If you were to then set the suspend until date on the 10 open holds, and use the "Update hold(s)" button, those 10 suspensions would apply to the 10 found holds and not the holds they should apply to!
Test Plan:
1) Place two holds on a record
2) Check in an item and trap it for the first hold
3) Now that one hold is waiting and the other is not, attempt to set
a suspension date using the "Update hold(s)" button
4) Note your hold does not get suspended!
5) Apply this patch
6) Restart all the things!
7) Repeat steps 1-3
8) Your hold should now be suspended!
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 2eebecfb621d0124b0b8be868c6d2a4fe959a9f7
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu May 23 07:55:15 2019 +0200
Bug 22969: fix biblionumber on 001 in UNIMARC XSLT
In UNIMARC default configuration the 001 is linked to biblio.biblionumber.
In some XSLT files, 090$a is used.
This is by default biblioitems.biblionumber so it usually works but it may not be the same and var biblionumber is used to create hyperlinks to record detail page.
Test plan :
1) Use UNIMARC database
2) Set default in all XSLT system preferences
3) At OPAC, perform a search and click on a result
4) Check displayed page shows the correct biblio record
5) Same at intranet
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested on clean UNIMARC install.
Before insert new records: "alter table biblioitems AUTO_INCREMENT = 5"
Added two records, with result:
+--------------+------------------+
| biblionumber | biblioitemnumber |
+--------------+------------------+
| 1 | 5 |
| 2 | 6 |
+--------------+------------------+
Without patch, OPAC results shows for first record
http://opac/cgi-bin/koha/opac-detail.pl?biblionumber=5, Wrong!
with patch result is correct
Works, no errors
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c77e64de1ea64239e64e8479527f2b023adb5189
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Mar 4 18:29:24 2020 +0000
Bug 24798: smart-rules.tt has erroneous comments
This patch corrects a couple of invalid Template Toolkit comments in the
Circulation and Fines rules template.
To test, apply the patch and log into the staff client as an
administrator.
On the Circulation and Fines Rules page "View source" and look for
instances of the text "[#% Default branch %#]" There should be none.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
[EDIT] There is a theoretical difference between [% # and [%#. The latter
marks the whole directive as a comment and not just until EOL.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2cc6c709c1d106800cee6bfe257a88a741d3f319
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Mar 4 19:47:26 2020 +0000
Bug 24803: Remove JS error when clicking "Log in to your account"
This patch removes the "data-toggle" attribute from the login link in
order to avoid a JavaScript error. Since we have a custom click handler
to trigger the modal we don't need Bootstrap's "automatic" modal
handling.
Test plan:
1. Apply patch
2. Open F12 dev tools
3. Click "Log in to your account" on OPAC
4. Observe no Javascript errors in console
Signed-off-by: David Cook <dcook at prosentient.com.au>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0fcbec7507a4117a7389d8bcebffed57db3a477c
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Feb 27 00:28:48 2020 +0000
Bug 24719: Remove use of CGI object in C4::Context::set_remote_address()
This patch replaces the CGI "http" object method with its equivalent
class method, which doesn't require object instantiation and thus skips
global initialization and premature handling of the incoming HTTP request.
Test plan:
0. Disable Plack if it is enabled
1. Set koha_trusted_proxies in koha-conf.xml to 1.1.1.1
2. Clear Memcached
3. Try to upload MARCXML file to /cgi-bin/koha/tools/stage-marc-import.pl
4. Note that form below "Upload progress" never appears and errors show
in browser console
5. Apply the patch
6. Try to upload MARCXML file to /cgi-bin/koha/tools/stage-marc-import.pl
7. Note that form appears below "Upload progress"
Signed-off-by: Nick Clemens <nick 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>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 8 +-
C4/Context.pm | 3 +-
C4/SIP/ILS.pm | 8 +-
C4/SIP/ILS/Transaction/FeePayment.pm | 20 +++-
C4/SIP/Sip/MsgType.pm | 42 ++++++-
Koha.pm | 2 +-
Koha/Account.pm | 27 ++++-
Koha/Account/Line.pm | 92 ++++++++++++++
Koha/REST/V1/Patrons/Account.pm | 2 +-
cpanfile | 2 +
installer/data/mysql/sysprefs.sql | 2 +
installer/data/mysql/updatedatabase.pl | 12 ++
.../intranet-tmpl/prog/en/includes/holds_table.inc | 4 +-
.../prog/en/includes/renew_results.inc | 12 ++
.../prog/en/includes/renew_strings.inc | 32 +++++
.../en/modules/admin/preferences/circulation.pref | 14 +++
.../prog/en/modules/admin/smart-rules.tt | 4 +-
.../prog/en/modules/catalogue/results.tt | 8 +-
.../prog/en/modules/members/boraccount.tt | 1 +
.../intranet-tmpl/prog/en/modules/members/pay.tt | 1 +
.../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 2 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +-
.../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 2 +-
.../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 6 +-
members/boraccount.pl | 20 ++++
members/pay.pl | 19 +++
members/paycollect.pl | 36 ++++--
reserve/modrequest.pl | 4 +-
t/db_dependent/Accounts.t | 16 +--
t/db_dependent/Circulation.t | 11 +-
t/db_dependent/Koha/Account.t | 78 +++++++++++-
t/db_dependent/Koha/Account/Line.t | 133 ++++++++++++++++++++-
t/db_dependent/Koha/Account/Lines.t | 3 +
t/db_dependent/api/v1/holds.t | 2 +-
34 files changed, 573 insertions(+), 57 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/renew_results.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/renew_strings.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list