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 1-6 Link Here
1
function mergeAuth(authid, summary) {
1
function mergeAuth(authid, summary) {
2
    var alreadySelected = $.cookie('auth_to_merge');
2
    var alreadySelected = $.cookie('auth_to_merge');
3
    if (alreadySelected !== null) {
3
    if (alreadySelected !== undefined) {
4
        alreadySelected = JSON.parse(alreadySelected);
4
        alreadySelected = JSON.parse(alreadySelected);
5
        $.cookie('auth_to_merge', '', { 'path': '/', 'expires': -1 });
5
        $.cookie('auth_to_merge', '', { 'path': '/', 'expires': -1 });
6
        var refstring = "";
6
        var refstring = "";
Lines 16-22 function mergeAuth(authid, summary) { Link Here
16
16
17
function showMergingInProgress() {
17
function showMergingInProgress() {
18
    var alreadySelected = $.cookie('auth_to_merge');
18
    var alreadySelected = $.cookie('auth_to_merge');
19
    if (alreadySelected !== null) {
19
    if (alreadySelected !== undefined) {
20
        alreadySelected = JSON.parse(alreadySelected);
20
        alreadySelected = JSON.parse(alreadySelected);
21
        $('#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>");
21
        $('#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>");
22
        $('#cancel_merge').click(function(event) {
22
        $('#cancel_merge').click(function(event) {
23
- 

Return to bug 12295