[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.06-23-g9f1e237

[Git repo owner]

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, 3.22.x has been updated
       via  9f1e23735f46a8b014d4a8983796f1b8b37cc9b4 (commit)
       via  aa8b468a13760b23c6ea29fddd43ade34e594af0 (commit)
      from  b486a64c16486a339dc81140e7a5d65851add26a (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 9f1e23735f46a8b014d4a8983796f1b8b37cc9b4
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Mar 28 20:09:01 2016 +0000

    Bug 15682 - Only allow merging of 2 or more records form lsits (for consistency)
    
    Test as above but on shelves.pl
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.z>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
    (cherry picked from commit 9550e37fc66402500adf8bca7a1c90ee0104cdd0)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit aa8b468a13760b23c6ea29fddd43ade34e594af0
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Mar 28 20:01:30 2016 +0000

    Bug 15682 - Merging records from cataloguing search only allows to merge 2 records
    
    To test:
    1 - Perform a cataloging search
    2 - Attempt to merge 0 results - should fail
    3 - Attempt to merge 1 resutls - should fail
    4 - Attempt to merge 2 results - should succeed
    5 - Attempt to merge 3 results - should succeed
    6 - Test any other amount of records and if more than 1 it should
    succeed
    
    **Note: On shelves.pl you can merge a single record.  I think that is
    incorrect so made this only work for 2. Will add a followup to fix
    shelves.pl
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.z>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
    (cherry picked from commit 8f1e5ad95fd78cbf09028e3d2dfe0b2b77d4dd21)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt  |   12 ++++++++----
 .../prog/en/modules/virtualshelves/shelves.tt              |    6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository