Bugzilla – Attachment 28501 Details for
Bug 12295
Javascript error when merging authorities
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12295: fix Javascript error when merging authorities
Bug-12295-fix-Javascript-error-when-merging-author.patch (text/plain), 2.48 KB, created by
Galen Charlton
on 2014-05-27 21:11:00 UTC
(
hide
)
Description:
Bug 12295: fix Javascript error when merging authorities
Filename:
MIME Type:
Creator:
Galen Charlton
Created:
2014-05-27 21:11:00 UTC
Size:
2.48 KB
patch
obsolete
>From a0f668066b80d9ebbd1ecb5b849f9b14905050cf Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >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 <bgkriegel@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@esilibrary.com> >--- > 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 @@ > //<![CDATA[ > function mergeAuth(authid, summary) { > var alreadySelected = $.cookie('auth_to_merge'); >- if (alreadySelected !== null) { >+ if (alreadySelected !== undefined) { > alreadySelected = JSON.parse(alreadySelected); > $.cookie('auth_to_merge', '', { 'path': '/', 'expires': -1 }); > var refstring = ""; >@@ -18,7 +18,7 @@ function mergeAuth(authid, summary) { > > function showMergingInProgress() { > var alreadySelected = $.cookie('auth_to_merge'); >- if (alreadySelected !== null) { >+ if (alreadySelected !== undefined) { > alreadySelected = JSON.parse(alreadySelected); > $('#merge_in_progress').html(_("Merging with authority: ") + "<a href='detail.pl?authid=" + alreadySelected.authid + "'><span class='authorizedheading'>" + alreadySelected.summary + "</span> (" + alreadySelected.authid + ")</a> <a href='#' id='cancel_merge'>" + _("Cancel merge") + "</a>"); > $('#cancel_merge').click(function(event) { >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12295
:
28376
|
28498
|
28500
| 28501