[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.08-18-g38ba63f

[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  38ba63f3c46ea70c475283b1ce080696229f03e8 (commit)
      from  ae0bb85a4f2bfb56f5c3d033cb5198374c869caa (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 38ba63f3c46ea70c475283b1ce080696229f03e8
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue May 20 14:58:32 2014 -0400

    Bug 12295: fix Javascript error when merging authorities
    
    Attempting to merge authorities results in the following error:
    Uncaught SyntaxError: Unexpected token u authorities-home.pl:284
        showMergingInProgress authorities-home.pl:284
        (anonymous function) authorities-home.pl:297
        o jquery.js:2
        p.fireWith jquery.js:2
        e.extend.ready jquery.js:2
        c.addEventListener.B
    
    This was the result of the upgrade of jquery-cookie by the patch
    for bug 11369; newer versions of jquery-cookie changed the return of
    $.cookie('foo') from null to undefined when the cookie is not present.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    No test plan, no errors.
    
    Test
    1. search some authorities
    2. click merge, on browser dev console pops reported error message
    'Unexpected token u authorities-home.pl...'
    No way to marge auths
    3. with pach applied, merging works again
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 1857c444cc6666331eae34e9a99fa1eaa3f1c760)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository