[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.11-28-gf2dfaf5

Git repo owner gitmaster at git.koha-community.org
Wed May 23 07:42:13 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.05.x has been updated
       via  f2dfaf59a75773de83b4945aa8b8c5b1de94f13a (commit)
       via  15b933691dc4669483c84c205f41f573578a3f9d (commit)
       via  2fac63ae095572c10a6eb895608f6fa987d4182b (commit)
       via  b7884c7fad193054cfd08b38ab7f38aa627e5448 (commit)
       via  84fca5c20e4f950665eb009d38ad43cdfe61ecf8 (commit)
       via  8b19de7bc31bea826dc504cc61a2803bded35dd0 (commit)
       via  26d56adbe9d06e259d28068987304ba5e323889c (commit)
       via  b4ad5070472c0e0f61e4ed016cdd23f6b8bd2dc8 (commit)
      from  f54db7492dc703b306239279833a2036ba021e7f (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 f2dfaf59a75773de83b4945aa8b8c5b1de94f13a
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>
    (cherry picked from commit 9d96397f55b333d63bec4fc09690aefcd164f809)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 15b933691dc4669483c84c205f41f573578a3f9d
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>
    (cherry picked from commit 5a185e0d1a62a003d7acb8569465bb145c7585f0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 2fac63ae095572c10a6eb895608f6fa987d4182b
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>
    (cherry picked from commit 7ecc1257865d47336071412bf65b321090b69ce4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b7884c7fad193054cfd08b38ab7f38aa627e5448
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>
    (cherry picked from commit 07cc384cdaa5b191a55fe2fe300705d20a908a72)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 84fca5c20e4f950665eb009d38ad43cdfe61ecf8
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>
    (cherry picked from commit 4df24fdde1b6845930d2532c23be2e6d3bf6ef9a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 8b19de7bc31bea826dc504cc61a2803bded35dd0
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>
    (cherry picked from commit a4946164f6c7b43eff22b041c0b1eacd3a232f9d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 26d56adbe9d06e259d28068987304ba5e323889c
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
    
    (cherry picked from commit 40e865ba1632c002af37e9ddc1255bfacb3fd8d0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b4ad5070472c0e0f61e4ed016cdd23f6b8bd2dc8
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>
    (cherry picked from commit a1e044094b2c29024dfe66b76c7bf2c619be0c7a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Letters.pm                                      |    6 ++++
 Koha/Object.pm                                     |    3 +-
 Koha/Virtualshelfshare.pm                          |   18 +++++++---
 acqui/neworderempty.pl                             |   13 ++++---
 .../prog/en/modules/acqui/newordersubscription.tt  |    2 +-
 opac/opac-shareshelf.pl                            |   38 +++++++++-----------
 t/db_dependent/Koha/Object.t                       |   14 ++++++--
 t/db_dependent/Virtualshelves.t                    |   10 +++++-
 8 files changed, 70 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list