[koha-commits] main Koha release repository branch master updated. v19.11.00-2279-g85ab68c07f
Git repo owner
gitmaster at git.koha-community.org
Fri May 22 11:02:09 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, master has been updated
via 85ab68c07f9240eba08d74b232be8434e65e9afb (commit)
via 9e665fb9a753032fed711959f1d8cc5780655b8c (commit)
via 4e945dff87a8bc4badb605361c1db63f71b04a07 (commit)
via 7ce6f7895610913f35fb1531faa1a40cefcd5f88 (commit)
via bbe6b07f4340afca18763724194fbc577b77959d (commit)
via 10af741387a75d29c6b7782c6ce3d2c07cad9517 (commit)
via 70ae2eaf9cdc7708f85b1724e5bc89623355b585 (commit)
via aa1f0fd73fa2a8dadd86ef5defc390e164845429 (commit)
via e9e8b635e14fe1229006b556e8aa0babf61455c7 (commit)
via d864c5640a3e3b02cbb64bde034935fa746a09ce (commit)
via 1bcc45be621b19dc602d675ca10d844301496b06 (commit)
via 635242a69a5ed049801d018a6be712d8dcbabb07 (commit)
via 67ff0f72854d4dabdda8cb59696f15e7b5d88c2a (commit)
via 37370c415ab5e59422aff46be14ccfec0cf8c373 (commit)
via 5169c5fab8cd8ada5442b66bfa2f2165e540b9ec (commit)
via 8d0c44578524dc2bd7b380dac56a53382b5aca7e (commit)
via 84bd1ac370db07d2b05c1c39433cb7963a98be71 (commit)
from 5f9cc8ada9a3186265f7c4fff1529775f03ac969 (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 85ab68c07f9240eba08d74b232be8434e65e9afb
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed May 20 19:04:24 2020 -0300
Bug 24229: Avoid fetching ALL items in test
I'm not sure what we need to test here, besides we get results. I'm
pretty sure we shouldn't allow a plain GET return all objects because it
could cause a DOS very easily. But it certainly belongs to a separate
bug/discussion.
In this case, I put a constraint on the items domain (by using
_per_page=10 in the query params) so it won't happen that under certain
conditions the user agent used by Test::Mojo time outs.
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: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9e665fb9a753032fed711959f1d8cc5780655b8c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu May 14 11:47:51 2020 +0000
Bug 25473: Move JavaScript out of the footer of addorderiso2709.tt
This patch undoes the move of the JavaScript block to the footer made in
Bug 22734. The item information tab can include embedded JavaScript for
cataloging plugins, and these don't currently work with JS in the
footer.
To test, apply the patch and test the JavaScript driven features of the
"Add to basket from a staged file" page:
- Acquisitions -> Vendor -> Basket -> Add to basket from a staged file
- MARC and Card previews, select all/clear all
- Item information tab: Cataloging plugins for fields like
date acquired, barcode
- Default accounting details tab: Show inactive control
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4e945dff87a8bc4badb605361c1db63f71b04a07
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 21 15:35:33 2020 +0200
Bug 25567: Fix typo categorycode vs category_code
Well, this is actually the real root of the error!
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7ce6f7895610913f35fb1531faa1a40cefcd5f88
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 21 15:30:35 2020 +0200
Bug 25567: Prevent patron category type's categorycode to be created with ""
It must be NULL/undef, the default from the DB.
The method Koha::Patron::Attribute::Type->categorycode is not covered by tests!
To recreate:
Create a new patron attribute type, don't select a patron's category (and not repeatable or unique)
Go to the batch patron modification tool, enter a cardnumber, next.
=> boom!
Apply the patch, edit the patron attribute, save
Go to the batch patron modification tool, enter a cardnumber, next.
=> success!
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bbe6b07f4340afca18763724194fbc577b77959d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 13 15:18:29 2020 +0200
Bug 24413: Add tests
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 10af741387a75d29c6b7782c6ce3d2c07cad9517
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 21 12:37:44 2020 +0100
Bug 24413: Do not remove the restrictions from AddReturn
As we are now removing them from MarkIssueReturned they should not be
removed from AddReturn as well.
Also I think this will fix a regression, if $doreturn is not set (in
case the item is withdrawn and BlockReturnOfWithdrawnItems or the item
is lost and BlockReturnOfLostItems, and other specific cases).
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 70ae2eaf9cdc7708f85b1724e5bc89623355b585
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 17 16:27:57 2020 +0100
Bug 24413: Apply AutoRemoveOverduesRestrictions for lost items
It's quite hard to know where this need to be fixed.
it can be either MarkIssueReturned or LostItem, depending on the
different cases we want to handle.
This patch picked MarkIssueReturned, but maybe the similar code in
AddReturn needs to be removed then.
== Test plan ==
1. Set MarkLostItemsAsReturned to 'from items tab of the catalog module'
2. Set AutoRemoveOverduesRestrictions to 'Do'
3. Set up an overdues restriction in the notice triggers
4. Check out an item and let the overdues process restrict the account
5. Navigate to the moredetail.pl page (items tab) for the overdue item
6. Mark the item lost
7. Return to the account in question - notice the item has been returned, but the restriction remains
8. Clean state: remove restriction + remove item lost status
9. Apply patch
10. Redo the test but this time in addition to the item being returned,
the restriction will be lifted.
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit aa1f0fd73fa2a8dadd86ef5defc390e164845429
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 13 13:42:02 2020 +0200
Bug 24612: Use the reserve_id to identify a reserve when building a notice
Now that we have the reserve_id PK on the reserves table we should use
it (instead of the couple borrowernumber, biblionumber)
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e9e8b635e14fe1229006b556e8aa0babf61455c7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 13 13:10:55 2020 +0200
Bug 24612: Add tests
ReserveSlip call need to be adjusted in test.
We also add a new reserve (same biblio, same patron) to highlight the problem.
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d864c5640a3e3b02cbb64bde034935fa746a09ce
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 12 10:02:56 2020 +0100
Bug 24612: Make hold-transfer-slip take reserve_id
To make sure we are going to display the correct hold's info we need to
pass the reserve_id.
== Test plan ==
1. Add some content to HOLD_SLIP notice, e.g.
<h2>[% branch.branchname %]</h2>
<div>[% biblio.author %]<br>[% biblio.title %]<br>[% item.barcode %]
<ul><li> Reserve ID: [% hold.reserve_id %]</li>
<li>Expiration date: [% hold.expirationdate %]</li></ul>
2. Add 2 holds for 1 patron to a single record
3. Check the reserve IDs in the reserves table - on a clean sandbox, they will be 1 and 2
4. Check in one of the items from the record and print the slip
5. Note that the reserve ID on the slip is 2 and the expiration date is blank
6. Repeated check ins do not change this
7. Check in a second item from the record
8. Note that the reserve ID for this hold is also 2, but this time the expiration date is filled in
9. Check in the first item again - the reserve ID stays as 2, but this time the expiration date is filled in
10. Apply patch
11. cancel the holds to come back to a clean state
(and maybe ensure items aren't in transit)
12. redo the test and see the following differences
13. 1st checkin:
1. expiration date ok
2. the reserve ID is the one of the first hold
14. 2nd checkin:
1. expiration date ok
2. the reserve ID is the one of the second hold
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1bcc45be621b19dc602d675ca10d844301496b06
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri May 8 16:13:40 2020 +0000
Bug 25428: Correctly encode link if authority subfield is a URL
This patch modifies the script and template for showing the details of
an authority record so that if the authority subfield is configured to
be a link the link is correctly output in the template.
To test you must have an authority type configured with at least one
subfield designated as a URL:
- Go to Administration -> Authority types
- Select "MARC structure" from the actions menu for the authority type
you want to modify.
- Select "Subfields" from the actions menu for the tag containing
the subfield you want to modify (for instance 856).
- Edit the subfield you want to display as a link (e.g. subfield u).
- In the subfield configuration form under "Advanced constraints" check
the "Is a URL" checkbox and save your changes.
- Apply the patch and go to Authorities in the staff interface.
- Search for or create an authority record which contains URL
information in the right subfield (for instance 856$u).
- View the details for the record. Using the 856 example, the "8" tab
should contain an active link pointing to the correct URL.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 635242a69a5ed049801d018a6be712d8dcbabb07
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 11 10:58:15 2020 +0200
Bug 25452: Restore alternate address email display
Broken since
commit 0ab22e1c7c6b6e8d14a4fb7478ab2a3d42da347d
Bug 18789: Send Koha::Patron object to the templates
Test plan:
Create or modify a patron, fill the "email" field of the "alternate
address" block (B_email)
Go to the detail view of the patron
=> Without this patch the email is not display
=> With this patch applied you see it!
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 67ff0f72854d4dabdda8cb59696f15e7b5d88c2a
Author: Slava Shishkin <slavashishkin at gmail.com>
Date: Thu May 14 17:53:47 2020 +0300
Bug 25506: Fix for "Use of uninitialized value" in about.pl
Perl warning on the "About Koha" page:
Use of uninitialized value in string eq
at /home/vagrant/kohaclone/about.pl line 220.
Fixed by adding additional precheck for
C4::Context->config('zebra_auth_index_mode') being Perl's "true".
To test:
1) Ensure you don't have "<zebra_auth_index_mode>...
</zebra_auth_index_mode>" in your koha-conf.xml so you will have
"C4::Context->config" returning "undef"
2) Go to the "About Koha" page.
3) Observe the warning in the log file.
4) Apply patch.
5) Repeat step 2.
6) Check that previous warning was suppressed.
Signed-off-by: Andreas Roussos <a.roussos at dataly.gr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 37370c415ab5e59422aff46be14ccfec0cf8c373
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 21 12:00:34 2020 +0200
Bug 25563: (bug 24386 follow-up) Don't disable submit button if form has not been submitted yet
On bug 24386 we prevent double form submission using the our own preventDoubleFormSubmit JS function.
The problem is that we are checking some conditions, and prevent the
form submission if something is not filled (for instance no checkbox
checked, or no fund selected).
Technically it means that:
- click the submit button
- it submits the form
- we disable the submit button
- we prevent the form to be submitted before something is wrong
At this stage the button is disabled and the form cannot be longer be
submitted.
This patch replaces the "on submit" event of the form with the "on click" event of the submit button.
Which means we are going to:
- click the submit button
- we prevent the form to be submitted before something is wrong
=> The button will only be disabled if the form is really submitted
Test plan:
- stage a marc record
- acquisitions: have a basket
- click on "Add to basket"
- "From a staged file"
- Don't tick the record
- Save
- You should see an expected error message
- Tick the record
- Save
- You should see an expected error message
- Choose a fund
- Click the "Save" button as many times as you can, to try double submit
it.
=> The order is saved
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5169c5fab8cd8ada5442b66bfa2f2165e540b9ec
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 20 17:12:56 2020 +0200
Bug 25411: Group conditions in if elsif
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8d0c44578524dc2bd7b380dac56a53382b5aca7e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu May 14 19:09:04 2020 -0300
Bug 25411: Add special handling for public plugin routes
This patch implements the required logic in the API code so plugins are
not affected by the new RESTPublicAnonymousRequests system preference.
It is up to the plugin develpers to handle this
To test:
1. Apply the tests patch
2. Run:
$ kshell
k$ prove t/db_dependent/Koha/REST/Plugin/PluginRoutes.t
=> FAIL: Notice the tests fail
3. Apply this patch
4. Repeat 2
=> SUCCESS: Tests pass! Yay! Not bad for a friday evening!
5. Sign off :-D
Sponsored-by: ByWater Solutions
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 84bd1ac370db07d2b05c1c39433cb7963a98be71
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu May 14 15:15:52 2020 -0300
Bug 25411: Regression tests
This patch adds tests the new RESTPublicAnonymousRequests syspref
doesn't apply to routes added by plugins.
It is up to the plugin developer to handle those conditions.
To test:
1. Apply this patch
2. Run:
$ kshell
k$ prove t/db_dependent/Koha/REST/Plugin/PluginRoutes.t
=> FAIL: Notice the tests fail
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
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 | 25 +++++----
C4/Letters.pm | 2 +-
C4/Reserves.pm | 36 +++----------
Koha/REST/V1/Auth.pm | 14 +++--
about.pl | 5 +-
admin/patron-attr-types.pl | 2 +-
authorities/detail.pl | 3 +-
circ/circulation.pl | 3 +-
circ/hold-transfer-slip.pl | 10 +---
circ/returns.pl | 11 +---
.../prog/en/modules/acqui/addorderiso2709.tt | 32 +++++-------
.../prog/en/modules/authorities/detail.tt | 6 ++-
.../prog/en/modules/circ/circulation.tt | 4 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 +-
.../prog/en/modules/members/moremember.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js | 8 ++-
t/db_dependent/Circulation/MarkIssueReturned.t | 38 +++++++++++++-
t/db_dependent/Koha/REST/Plugin/PluginRoutes.t | 61 ++++++++++++++++++----
t/db_dependent/Letters/TemplateToolkit.t | 26 +++++----
t/db_dependent/api/v1/items.t | 10 ++--
t/lib/Koha/Plugin/Test.pm | 61 ++++++++++++++++------
.../lib/Koha/Plugin/Test/Controller.pm | 26 ++++-----
tools/modborrowers.pl | 4 +-
23 files changed, 245 insertions(+), 148 deletions(-)
copy Koha/BiblioFramework.pm => t/lib/Koha/Plugin/Test/Controller.pm (73%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list