From a0f668066b80d9ebbd1ecb5b849f9b14905050cf Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 20 May 2014 14:58:32 -0400 Subject: [PATCH] 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 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 --- koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc index 4981a39..cf4a072 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc @@ -2,7 +2,7 @@ //" + alreadySelected.summary + " (" + alreadySelected.authid + ") " + _("Cancel merge") + ""); $('#cancel_merge').click(function(event) { -- 1.7.10.4