View | Details | Raw Unified | Return to bug 12295
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc (-3 / +2 lines)
Lines 2-8 Link Here
2
//<![CDATA[
2
//<![CDATA[
3
function mergeAuth(authid, summary) {
3
function mergeAuth(authid, summary) {
4
    var alreadySelected = $.cookie('auth_to_merge');
4
    var alreadySelected = $.cookie('auth_to_merge');
5
    if (alreadySelected !== null) {
5
    if (alreadySelected !== undefined) {
6
        alreadySelected = JSON.parse(alreadySelected);
6
        alreadySelected = JSON.parse(alreadySelected);
7
        $.cookie('auth_to_merge', '', { 'path': '/', 'expires': -1 });
7
        $.cookie('auth_to_merge', '', { 'path': '/', 'expires': -1 });
8
        var refstring = "";
8
        var refstring = "";
Lines 18-24 function mergeAuth(authid, summary) { Link Here
18
18
19
function showMergingInProgress() {
19
function showMergingInProgress() {
20
    var alreadySelected = $.cookie('auth_to_merge');
20
    var alreadySelected = $.cookie('auth_to_merge');
21
    if (alreadySelected !== null) {
21
    if (alreadySelected !== undefined) {
22
        alreadySelected = JSON.parse(alreadySelected);
22
        alreadySelected = JSON.parse(alreadySelected);
23
        $('#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>");
23
        $('#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>");
24
        $('#cancel_merge').click(function(event) {
24
        $('#cancel_merge').click(function(event) {
25
- 

Return to bug 12295