[koha-commits] main Koha release repository branch master updated. v3.14.00-1040-ge7c2a20

[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  e7c2a2031f470ab5e22d431bab7076dd0fd51654 (commit)
       via  08e594f149a120d0b43e2c5795f1342290231e13 (commit)
       via  6b75d95680a28f68bdc50e2259a648f0e2071871 (commit)
      from  e88117b5fab293137bb74f57095a1ad1cdb7dbfa (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 e7c2a2031f470ab5e22d431bab7076dd0fd51654
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Sun May 4 18:41:33 2014 +0000

    Bug 11763: (follow-up) do not display anything in actions column if user cannot manage a budget
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 08e594f149a120d0b43e2c5795f1342290231e13
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Apr 14 13:11:12 2014 +0200

    Bug 12019: ensure that it is optional to define an owner if a fund is restricted
    
    Before this patch, the C4::Budgets::CanUserUseBudget assumed that
    budget_owner_id was set if a restriction (budget_permission) exists.
    see
            && $budget->{budget_owner_id}
            && $budget->{budget_owner_id} != $borrower->{borrowernumber}
    
    Actually a restriction could exists on users and/or library without
    being forced to define an owner.
    
    Test plan:
    Create a fund A without restriction
    Create a fund B restricted to an owner
    Create a fund C restricted to a non defined owner
    Create a fund D restricted to owner and users (try defining/no
    defining an owner and/or users)
    Create a fund E restricted to owner, users and library (try
    defining/no defined an owner and/or users)
    
    With different logged in users, try to show/edit these differents funds.
    The restriction should be correctly applied.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Tested various permission combinatons, visibility of funds is now ok.
    - not superlibrarian, no buget_manage_all,
      no owner, no users, no library, no restrictions on the fund
      = visible
    - changed: library = staff patron library,
      restriction = Owner, users and library
      = visible
    - changed: library = not staff patron library
      = invisible
    - changed: budget_manage_all
      = visible
    - changed: owner = staff patron
      no budget_manage_all
      = visible
    - changed: no owner, user = staff patron
      = visible
    - changed: no user, owner = another user, restriction = owner
      = invisible
    - changed: budget_manage_all
      = visible
    - changed: no budget_manage_all but superlibrarian
      = visible
    ...
    
    Passes tests and QA script, also t/Budgets/*
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 6b75d95680a28f68bdc50e2259a648f0e2071871
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 2 13:27:08 2014 +0200

    Bug 12019: FIX budget_owner_id node is duplicated
    
    The input witht the budget_owner_id id is duplicated.
    It breaks the jQuery selector
      $('#budget_owner_id').val('');
    
    Signed-off-by: marjorie barry-vila <marjorie.barry-vila at ccsr.qc.ca>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Budgets.pm                                      |   58 ++++++++++++++------
 .../prog/en/modules/admin/aqbudgets.tt             |    4 +-
 t/Budgets/CanUserModifyBudget.t                    |   14 ++---
 t/Budgets/CanUserUseBudget.t                       |   14 ++---
 4 files changed, 56 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
main Koha release repository