[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.06-52-g1b02c03

[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.14.x has been updated
       via  1b02c031a34e7e3e3caabbe0184fb5fe71447d95 (commit)
       via  f08154588cb07d8d85b25d13a566c2c689148577 (commit)
      from  8a59c43fc329d660239c2e23a2b4f84bd745610b (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 1b02c031a34e7e3e3caabbe0184fb5fe71447d95
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed Feb 19 16:40:06 2014 +0000

    Bug 11779: (follow-up) improve GetLoggedInBranchcode() and add test cases
    
    This patch adjusts the new GetLoggedInBranchcode() template function so
    that it returns the empty string rather than undef if there is no
    active user environment.  That way, there won't be lots of undefined
    value warnings if/when this function gets used in the OPAC.
    
    This patch also adds test cases.
    
    To test:
    
    [1] Verify that there are no regressions in the main test
        plan for this bug.
    [2] Verify that prove -v t/db_dependent/Koha_template_plugin_Branches.t
        passes.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 065a3a5efa9b90723460a607ac85591c17945b00)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit f08154588cb07d8d85b25d13a566c2c689148577
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Feb 18 07:43:44 2014 -0500

    Bug 11779: fix unexpected change in logged-in library when changing overdue notice triggers
    
    Steps to reproduce:
    1) Log into staff intranet
    2) Set logged in branch
    3) Browse to tools/overdue notice triggers
    4) Select a branch from the pulldown that is not your logged in branch
    5) use the "Check out" bar at the top of the page to search for a patron
    to check out to
    6) Once you have landed here, click the "check out" tab link again, or
       the Edit button ( any action really )
    7) Note your logged in branch has now changed to the once selected
       when editing the notice/status triggers
    
    This is due to the way the patron search passes the branchcode to be
    used via the form. This form assumes the branchcode variable is
    always the currently logged in branch, which may not and is not
    always the case.
    
    Test Plan:
    1) Apply this patch
    2) Repeat the steps to reproduce above
    3) Note your logged in branch does not change
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Funny bug :) This patch fixes the described issue and should not
    introduce regression.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 858083c8e907bde4efa6842cd45ff91bf1f6e24f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha/Template/Plugin/Branches.pm                          |    9 +++++++++
 .../intranet-tmpl/prog/en/includes/patron-search-box.inc  |    6 ++++--
 t/db_dependent/Koha_template_plugin_Branches.t            |   13 +++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository