[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.05-63-g9d96397
Git repo owner
gitmaster at git.koha-community.org
Tue May 22 12:58:37 CEST 2018
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.11.x has been updated
via 9d96397f55b333d63bec4fc09690aefcd164f809 (commit)
via 5a185e0d1a62a003d7acb8569465bb145c7585f0 (commit)
via 7ecc1257865d47336071412bf65b321090b69ce4 (commit)
via 07cc384cdaa5b191a55fe2fe300705d20a908a72 (commit)
via 4df24fdde1b6845930d2532c23be2e6d3bf6ef9a (commit)
via 9c702eb2c34011ebc034bfab12e88875d4fde4cf (commit)
via 3fbbb423d2b8df7ba0d4b9efa9f5a0b2f2fa72a1 (commit)
via 7a0de612a0b24bf9a04a29b877e8830d230eae60 (commit)
via 13c9c3686be19b9717edbc90ef586414248d9b68 (commit)
via a4946164f6c7b43eff22b041c0b1eacd3a232f9d (commit)
via 40e865ba1632c002af37e9ddc1255bfacb3fd8d0 (commit)
via a1e044094b2c29024dfe66b76c7bf2c619be0c7a (commit)
via cdbe6e1094681da04778e02e0d817dcd00cf6ed3 (commit)
via 0858a029e095a810bf279b88504748a7b5fa9720 (commit)
via 7963834a937909c59060dec61f8bd930f50af6b0 (commit)
from e93241a7174930c52c6f03560027cd527492148d (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 9d96397f55b333d63bec4fc09690aefcd164f809
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri May 4 09:54:30 2018 +0200
Bug 11943: Add unit test for double accepts
Test plan:
Run t/db_dependent/Virtualshelves.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5a185e0d1a62a003d7acb8569465bb145c7585f0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri May 4 09:34:02 2018 +0200
Bug 11943: Prevent double accepts in Koha::Virtualshelfshare
This 'bug' existed long enough now to finally remove it ;)
We do so by deleting the invitation if the borrower already has a share
on this list. Actually not that hard.
We still need: a unit test and a db revision.
Test plan:
[1] Share a list. Let user B accept.
[2] Without this patch: Share again and let B accept again.
[3] Verify that you have two shares for this list in virtualshelfshares.
[4] With this patch: Share another list, let B accept.
[5] Share this other list again, let B accept again.
[6] Verify that virtualshelfshares does not contain double entries now.
(Note: This pertains to the second list only.)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7ecc1257865d47336071412bf65b321090b69ce4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri May 4 08:10:46 2018 +0200
Bug 20687: (follow-up) Look for invitekey in show_accept and fix error codes
We should check the invitekey in show_accept by passing it along in the
search call.
On the way I fixed some error checking: if the list number is invalid, or
the list is public or you are the owner, or if the key is not found, we
should set the right error code; the template contains those messages.
Test plan:
[1] Share a list and accept a correct invitation with another user.
[2] Try to accept some invalid proposals: wrong key, wrong list.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested invalid key, wrong list, owner, public list, expiry.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 07cc384cdaa5b191a55fe2fe300705d20a908a72
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue May 1 13:47:18 2018 +0000
Bug 20687: Check all share keys for a given list
This patch gets all the shares for a list and iterates through to find
the correct one when accepting from a link
To test:
1 - Create a private list in the opac
2 - Invite 2 patrons to the list
3 - Try to accept from the patron you first shared to
4 - You will get a failure message about expiration of the link
5 - Apply patch
6 - Now try to accept the first share
7 - It works! Success!
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4df24fdde1b6845930d2532c23be2e6d3bf6ef9a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 16 17:41:42 2018 -0300
Bug 19030: Preserve link between order and subscription when editing an order
The aqorders.subscriptionid info is not sent to the template when the
order is edited. Which means we lose this link.
Test plan:
Create an order from a subscription
Edit the order
=> Without this patch, the aqorders.subscriptionid value is set to NULL
and items are created when receiving serial.
=> With this patch applied the link is preserved and expected behaviors
are preserved during all the acquisition workflow
You should also try and create several orders from the same subscription
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9c702eb2c34011ebc034bfab12e88875d4fde4cf
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Tue Apr 10 16:50:56 2018 +0100
Bug 20556: Marking ILL request as complete..
When marking a request as complete, the status is updated internally
then the user to redirected to the view of the request.
Although the redirect header is sent, there is no exit to indicate that
the program flow should stop. As a result, an attempt is made to render
the template, which fails.
This patch simply adds the missing exit.
TEST PLAN
---------
- Create an ILL request
- "Manage request" > "Confirm request"
- "Mark completed"
- TEST: Ensure that no error is written to the error log upon clicking
"Mark completed"
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.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>
commit 3fbbb423d2b8df7ba0d4b9efa9f5a0b2f2fa72a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 19 16:21:57 2018 -0300
Bug 20562: Fix Returns.t test
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7a0de612a0b24bf9a04a29b877e8830d230eae60
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 16 13:48:54 2018 -0300
Bug 20562: Pass the Koha::Checkout object to AddIssuingCharge
We do not need to pass all those parameters, just the checkout object is
enough.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 13c9c3686be19b9717edbc90ef586414248d9b68
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Sun Apr 8 07:11:11 2018 +0000
Bug 20562: issue_id is not stored in accountlines for rental fees
Test Plan:
1) Apply this patch
2) Assign a charge to an item type
3) Checkout an item of that type to a patron
4) View the accountlines table for that patron
SELECT * FROM accountlines WHERE accounttype='Rent' and borrowernumber=##;
5) Note there is an issue_id
Or
1) Apply this patch
2) prove t/db_dependent/Circulation/issue.t
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a4946164f6c7b43eff22b041c0b1eacd3a232f9d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 16 12:56:01 2018 -0300
Bug 18725: Test return values of make_column_dirty
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 40e865ba1632c002af37e9ddc1255bfacb3fd8d0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Apr 13 09:38:50 2018 +0200
Bug 18725: (QA follow-up) Use make_column_dirty instead of status change
Moving the status to the invalid 'processing' might well have unwanted
side-effects. (The status column will be set to empty string and we have
a problem if it is not processed.)
This patch allows pass-through of DBIX's make_column_dirty in
Koha::Object (simple tests included) and uses it to force an update.
If the update does not return true, it still exits.
Test plan:
[1] Read the changes.
[2] Run t/db_dependent/Koha/Object.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
Koha/Object.pm
commit a1e044094b2c29024dfe66b76c7bf2c619be0c7a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Oct 26 09:04:59 2017 -0400
Bug 18725: Prevent process_message_queue to send duplicate emails if message_queue is not writable.
Last week, we had a database server whose disk filled, causing database writes to fail.
This meant that messages in message_queue marked 'pending' were not marked as 'sent' when they were added to the postfix mail queue; messages were sent every 15 minutes (as specified in the cron job) until the disk space issues were cleared.
I would suggest adding a token write to the start of process_message_queue.pl as a 'canary in the coal mine'. If the database write fails, process_message_queue should stop, because it's not safe to proceed sending emails that may not be marked 'sent'.
Test Plan:
1) Apply this patch
2) Make the message_queue table unwriteable somehow
3) Run process_message_queue.pl
4) Script should die with error
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>
commit cdbe6e1094681da04778e02e0d817dcd00cf6ed3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Apr 13 15:09:53 2018 -0300
Bug 20584: Prevent Koha/Patron/Categories.t to fail randomly
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0858a029e095a810bf279b88504748a7b5fa9720
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Mar 5 10:27:33 2018 +0100
Bug 19546: (QA follow-up) Make the returning cd more fool proof
Trivial and hypothetical fix.
If you create /root/AA B (space in dirname), the quotes added here will
help you to get back where you came from.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 7963834a937909c59060dec61f8bd930f50af6b0
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri Mar 2 10:36:34 2018 -0300
Bug 19546: Run starman from the instance's home dir
This patch makes koha-plack jump into the instance's home directory to
run.
It is required because Perl 5.18 introduced a breaking change that
makes perl die if @INC includes directories for which the user doesn't
have read permission, and need to be traversed when querying for a lib.
This is the case of '.', which is introduced automatically into @INC
until Perl 5.26 (which removes the 'feature').
The Mojolicious::Plugins lib prefixes the plugin names with
'Mojolicious::Plugin' so it first looks (for example) for
Mojolicious::Plugin::Koha::REST::Plugin::Pagination (Pagination is just
the first one on the list). When it looks for it at '.' it dies (because
of Perl's behaviour) so it doesn't query for the right namespace (the
following to try).
I only reproduced it in koha-testing-docker. To test, you just need to
try this patched koha-plack and make sure it doesn't break due to this
permissions issue.
To test:
- In your koha-testing-docker clone, run:
$ docker-compose up -p test
- Open a shell inside the container (on a separate terminal):
$ docker exec -it test_koha_1 bash
- From within the /root directory, restart plack:
$ cd /root
$ koha-plack --restart kohadev
=> FAIL: Logs show plack is broken due to permissions problems trying to
find Mojolicious::Plugin::Koha::REST::Plugin::Pagination
- Use the patched script from this patch:
$ /kohadevbox/koha/debian/scripts/koha-plack --restart kohadev
=> SUCCESS: Plack runs fine, no error in the logs
- Sign off :-D
Note: people who has environments in which the problems is reproducible,
please test this version of koha-plack and stamp your sign-off,
PLEASE.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 15 ++++----
C4/Letters.pm | 6 ++++
Koha/Object.pm | 3 +-
Koha/Virtualshelfshare.pm | 18 +++++++---
acqui/neworderempty.pl | 13 ++++---
debian/scripts/koha-plack | 7 ++++
ill/ill-requests.pl | 1 +
.../prog/en/modules/acqui/newordersubscription.tt | 2 +-
opac/opac-shareshelf.pl | 38 +++++++++-----------
t/db_dependent/Circulation/Returns.t | 10 ++++--
t/db_dependent/Circulation/issue.t | 13 ++++---
t/db_dependent/Koha/Object.t | 14 ++++++--
t/db_dependent/Koha/Patron/Categories.t | 7 ++--
t/db_dependent/Virtualshelves.t | 10 +++++-
14 files changed, 106 insertions(+), 51 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list