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>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1857c444cc)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
parent
ae0bb85a4f
commit
38ba63f3c4
|
|
@ -1,6 +1,6 @@
|
|||
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 = "";
|
||||
|
|
@ -16,7 +16,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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue