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

[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  ad2c1b3b8f20b3060c9a3a35c21a0757c685cbec (commit)
       via  96320a786bac92418b08b5af4d2b68746627482b (commit)
      from  33c12cf39588aa022eacaa0bca403c373a6bf8d5 (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 ad2c1b3b8f20b3060c9a3a35c21a0757c685cbec
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed Jun 19 08:52:56 2013 -0700

    Bug 10494: remove spurious warnings from the KohaBranchName plugin
    
    The KohaBranchName plugin now returns an empty string if
    given a NULL (undefined) library code or a library code that
    is not present in the database (e.g., the '__ANY__' placeholder
    that purchase suggestions can use).
    
    To test:
    
    [1] Create a purchase suggestion, setting the library
        to 'Any'.  Create a second one setting the library to
        a specific one.
    [2] Go to the suggestions overview page in the staff interface.
        When you do so, the Apache logs should contain a warning
        that looks like this:
    
    [Wed Jun 19 07:13:06 2013] [error] [client 192.168.1.10] [Wed Jun 19 07:13:06 2013] suggestion.pl: Use of uninitialized value in concatenation (.) or string at /home/koha/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt line 487., referer: http://koha-staff.metaquarry/cgi-bin/koha/acqui/acqui-home.pl
    
    [3] Apply the patch.
    [4] Refresh the suggestions overview page.  This time, there should be
        no new warning logged.
    [5] Verify that the library names for the two pending suggestions
        created in step 1 are displayed correctly.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script. Also adds new tests!
    
    Note: For the test plan to work you have to add the suggestion
    from the intranet, as Any is not an available option in OPAC.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 96320a786bac92418b08b5af4d2b68746627482b
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed Jun 19 08:47:34 2013 -0700

    Bug 10494: test cases for the KohaBranchName plugin
    
    To test, in a test database that has the sample branches
    loaded, run
    
    prove -v t/db_dependent/Koha_template_plugin_KohaBranchName.t
    
    Note that this includes regression tests for the issues
    reported in bug 10494; these won't pass without applying
    the patch that fixes them.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 Koha/Template/Plugin/KohaBranchName.pm             |   10 ++---
 .../Koha_template_plugin_KohaBranchName.t          |   37 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 t/db_dependent/Koha_template_plugin_KohaBranchName.t


hooks/post-receive
-- 
main Koha release repository