[koha-commits] main Koha release repository branch master updated. v3.14.00-137-g4a7bb58

Git repo owner gitmaster at git.koha-community.org
Sat Dec 14 01:51:12 CET 2013


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  4a7bb58b1daf5edc47581f17b3dfef1e7beac601 (commit)
       via  6000bfdf87db3f7f43feb21efd3cac8b7de9c048 (commit)
      from  945dbfc490e7bc8849f7b5f741856131c765cc75 (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 4a7bb58b1daf5edc47581f17b3dfef1e7beac601
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Aug 27 13:14:12 2013 -0400

    Bug 10626: (follow-up) replace another use of KohaBranchName
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    To test:
    Make sure
    - independentbranches is turned on
    - Your user doesn't have superlibrarian permission
    Then
    - Try to check out an item with home and holding branch !=
      logged in branch
    
    Patch works alright.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 6000bfdf87db3f7f43feb21efd3cac8b7de9c048
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jul 23 09:52:08 2013 -0400

    Bug 10626 - Remove doubled up TT plugins - Merge KohaBranchName and Branches
    
    Looking at the TT plugin directory I notice we have some plugins that
    seem to do the same thing:
    
    KohaBranchName.pm
    Branches.pm
    
    This patch drops KohaBranchName in favor of Branches
    
    Test Plan:
    1) Apply this patch
    2) View a basket group, note the branch name is displayed
    3) View a subscription's details, note the branch name is displayed
    4) View suggestions, note the branch names are displayed
    5) Return an item that needs transfered, note the branch name is displayed
    6) Run 'prove t/db_dependent/Koha_template_plugin_Branches.t'
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    Also tested with a branch name with umlauts.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 Koha/Template/Plugin/Branches.pm                   |    2 +-
 Koha/Template/Plugin/KohaBranchName.pm             |   33 --------------------
 .../prog/en/modules/acqui/basketgroup.tt           |   10 +++---
 .../prog/en/modules/circ/circulation.tt            |    4 +--
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    4 +--
 .../prog/en/modules/serials/subscription-detail.tt |    4 +--
 .../prog/en/modules/suggestion/suggestion.tt       |   16 +++++-----
 ...ranchName.t => Koha_template_plugin_Branches.t} |   12 +++----
 8 files changed, 26 insertions(+), 59 deletions(-)
 delete mode 100644 Koha/Template/Plugin/KohaBranchName.pm
 rename t/db_dependent/{Koha_template_plugin_KohaBranchName.t => Koha_template_plugin_Branches.t} (78%)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list