@@ -, +, @@
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
---
.../prog/en/includes/authorities_js.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
@@ -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: ") + "" + alreadySelected.summary + " (" + alreadySelected.authid + ") " + _("Cancel merge") + "");
$('#cancel_merge').click(function(event) {
--