[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.05.1-48-g3646806

[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.18.x has been updated
       via  364680635b7cd229a9ff3fac0c5b693ba69afc83 (commit)
       via  a04e8a33904fc279be776d3db85db19b7cf6713d (commit)
      from  254f4eaf39d5ad9fba68cf855e3f44bcff85d993 (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 364680635b7cd229a9ff3fac0c5b693ba69afc83
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Mar 26 16:10:11 2015 +0100

    Bug 7391: Return to cart after adding items to a list
    
    If you select items in your cart and choose to add them to a list, upon
    completion of the transaction the pop-up window, which was originally
    opened for the cart, is closed. Instead you should be returned to the
    Cart view.
    
    Test plan:
    Confirm the expected behavior.
    
    Confirmed.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 5502cd1623f5beaa505c5cacf9d52796ab0112a8)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit a04e8a33904fc279be776d3db85db19b7cf6713d
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Mar 22 22:07:32 2015 +0100

    Bug 13890 - Switch from full serials permission to 'routing' permission for reordering routing lists
    
    For changing the sequence of patrons on a routing list by changing
    one of the numbers via the pull downs, full serial permission is needed:
    
    To test:
    - Give your patron full serial permissions
    - Create a subscription and a routing list for it
    - Change the sequence on the routing list using the pull downs
    - Verify this works
    - Remove any of the serial sub permissions (claim serials or similar)
    - Verify changing the sequence now results in a permission error
    - Apply patch
    - Verify that the permission error is gone now
    - Remove the routing permission
    - Verify the permission error is back (but this seems to make sense)
    
    In general more fixes would be required to make all routing related
    features depend on the routing permission, but I think this fixes
    the bug making it depend on the correct permission.
    
    Followed test plan. Works as expected.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 889e1953ec7fa07c4778918de9de8952c660d22e)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 koha-tmpl/opac-tmpl/bootstrap/js/basket.js |    6 +++++-
 serials/reorder_members.pl                 |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository