[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-810-g14a1bd0

[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, master has been updated
       via  14a1bd0e420fd895f989ba88e0cad927697b6173 (commit)
       via  44364db8d53bf5e3135ae2de6270a920e5c053c1 (commit)
      from  dba36a7a1216238a260ea5fbe2218627487e9f19 (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 14a1bd0e420fd895f989ba88e0cad927697b6173
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Sun Jun 16 18:05:31 2013 -0700

    Bug 10258: offer to create basket group only when staff user has correct permission
    
    If the staff user does not have the group_manage acquisition permission,
    do not offer to create a new basket group when closing an order basket.
    
    This avoids a situation where if a staff member without that permission tries
    to close a basket and chose the option to create a bakset group, they would
    be redirected to the login page.
    
    To test:
    
    [1] Log in as a staff user that does not have
        the acquisition/group_manage permission.
    [2] Create a new order basket, attach at least one
        order line to it, then close it.
    [3] Verify that the confirmation page does not
        offer to create a basket group with the
        same name as the order basket.
    [4] Log in as a staff user that has the
        acquisition/group_manage permission.
    [5] Create and close an order basket.
    [6] Verify that this time, the confirmation page
        *does* offer to create a basket group.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 44364db8d53bf5e3135ae2de6270a920e5c053c1
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Jun 13 08:53:49 2013 -0700

    Bug 10258: fix permissions check for setting basket group for order basket
    
    Improve the code that displays and allows staff to
    set the basket group from the basket details page
    for a closed basket.
    
    Prior to this patch, a staff member who did not
    have the group_manage acquisition permission would
    still see a control to change the group that the
    basket belongs to; attempting to change the group
    would present with with a login page.
    
    This patch also does some tidying of how basket group
    details are passed to the template.
    
    To test:
    
    [1] Create an order basket and close it.  Do
        not assign it to a basket group.
    [2] View the basket details while logged in as
        a staff user who has the order_manage acquisitions
        permission but not the group_manage.  The
        displayed basket group should be "No group".
    [3] Switch to a staff user who also has the
        group_manage permission, then view the basket
        details again.  The basket group field should
        now be a select input that allows you to change
        the basket group.
    [4] Change the basket group.  Verify that the basket group
        you selected is now displayed as the current group
        for that order basket.  The basket group delivery and
        billing place fields should also now be displayed.
    [5] Close the basket group set in the previous step, then
        view the basket details again.  This time, the basket
        group name should be displayed with a suffix of " (closed)",
        and no input to change the group should be displayed.
    [6] Swith to a staff user who does not have the group_manage
        permission, view the basket details, and verify that
        the basket name is displayed with a suffix of " (closed)".
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 acqui/basket.pl                                    |   14 +++++---------
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   18 ++++++++++++++----
 2 files changed, 19 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository