@@ -, +, @@ - Select "Merge" from the Actions menu next to any result. - A message should appear at the top of the page: "Merging with authority: ". - Click "Cancel merge." The message should disappear. - Select a record to merge again. - Select another record. - The page should redirect to the authority merge page. --- koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc @@ -1,29 +1,29 @@ <script> function mergeAuth(authid, summary) { - var alreadySelected = $.cookie('auth_to_merge'); + var alreadySelected = Cookies.get('auth_to_merge'); if (alreadySelected !== undefined) { alreadySelected = JSON.parse(alreadySelected); - $.cookie('auth_to_merge', '', { 'path': '/', 'expires': -1 }); + Cookies.remove('auth_to_merge'); var refstring = ""; if (typeof alreadySelected.mergereference !== 'undefined') { refstring = "&mergereference=" + alreadySelected.mergereference; } window.location.href = "/cgi-bin/koha/authorities/merge.pl?authid=" + authid + "&authid=" + alreadySelected.authid + refstring; } else { - $.cookie('auth_to_merge', JSON.stringify({ 'authid': authid, 'summary': summary }), { 'path' : '/' }); + Cookies.set('auth_to_merge', JSON.stringify({ 'authid': authid, 'summary': summary }), { 'path' : '/' }); showMergingInProgress(); } } function showMergingInProgress() { - var alreadySelected = $.cookie('auth_to_merge'); + var alreadySelected = Cookies.get('auth_to_merge'); 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) { event.preventDefault(); - $.cookie('auth_to_merge', '', { 'path': '/', 'expires': -1 }); + Cookies.remove('auth_to_merge'); $('#merge_in_progress').empty(); }); } else { --