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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (+2 lines)
Lines 126-131 Link Here
126
            if ( document.location.hash ) {
126
            if ( document.location.hash ) {
127
                $( '#loginform' ).append( '<input name="auth_forwarded_hash" type="hidden" value="' + document.location.hash + '"/>' );
127
                $( '#loginform' ).append( '<input name="auth_forwarded_hash" type="hidden" value="' + document.location.hash + '"/>' );
128
            }
128
            }
129
            // if showLastPatron information was not cleared during logout, clear it now
130
            removeLastBorrower();
129
        });
131
        });
130
    </script>
132
    </script>
131
[% END %]
133
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js (-21 / +19 lines)
Lines 91-126 $.fn.selectTabByID = function (tabID) { Link Here
91
        $("#catalog-search-dropdown a").toggleClass("catalog-search-dropdown-hover");
91
        $("#catalog-search-dropdown a").toggleClass("catalog-search-dropdown-hover");
92
    });
92
    });
93
93
94
    if (typeof $.cookie("lastborrowernumber") !== "undefined" && $("#hiddenborrowernumber").val() != $.cookie("lastborrowernumber")) {
94
95
    if ( localStorage.getItem("lastborrowernumber") && $("#hiddenborrowernumber").val() != localStorage.getItem("lastborrowernumber")) {
95
        $("#lastborrower-window").detach().appendTo("#breadcrumbs");
96
        $("#lastborrower-window").detach().appendTo("#breadcrumbs");
96
        $("#lastborrowerlink").show();
97
        $("#lastborrowerlink").show();
97
        $("#lastborrowerlink").prop("title", $.cookie("lastborrowername") + " (" + $.cookie("lastborrowercard") + ")");
98
        $("#lastborrowerlink").prop("title", localStorage.getItem("lastborrowername") + " (" + localStorage.getItem("lastborrowercard") + ")");
98
        $("#lastborrowerlink").prop("href", "/cgi-bin/koha/circ/circulation.pl?borrowernumber=" + $.cookie("lastborrowernumber"));
99
        $("#lastborrowerlink").prop("href", "/cgi-bin/koha/circ/circulation.pl?borrowernumber=" + localStorage.getItem("lastborrowernumber"));
99
        $("#lastborrower-window").css("display", "inline-block");
100
        $("#lastborrower-window").css("display", "inline-block");
100
    }
101
    }
101
    if ($("a#logout").length > 0) {
102
102
        $("a#logout").click(function() {
103
            delCookie("lastborrowernumber");
104
            delCookie("lastborrowername");
105
            delCookie("lastborrowercard");
106
            delCookie("currentborrowernumber");
107
        });
108
    }
109
    $("#lastborrower-remove").click(function() {
103
    $("#lastborrower-remove").click(function() {
110
        delCookie("lastborrowernumber");
104
        removeLastBorrower();
111
        delCookie("lastborrowername");
112
        delCookie("lastborrowercard");
113
        delCookie("currentborrowernumber");
114
        $("#lastborrower-window").hide();
105
        $("#lastborrower-window").hide();
115
    });
106
    });
116
    if (typeof $.cookie("lastborrowernumber") === "undefined" || ($("#hiddenborrowernumber").val() != $.cookie("lastborrowernumber") && $.cookie("currentborrowernumber") != $("#hiddenborrowernumber").val())) {
107
    if ( localStorage.getItem("lastborrowernumber") || ($("#hiddenborrowernumber").val() != localStorage.getItem("lastborrowernumber") && localStorage.getItem("currentborrowernumber") != $("#hiddenborrowernumber").val())) {
117
        $.cookie("lastborrowernumber", $("#hiddenborrowernumber").val(), { path: "/" });
108
        localStorage.setItem("lastborrowernumber", $("#hiddenborrowernumber").val() );
118
        $.cookie("lastborrowername", $("#hiddenborrowername").val(), { path: "/" });
109
        localStorage.setItem("lastborrowername", $("#hiddenborrowername").val() );
119
        $.cookie("lastborrowercard", $("#hiddenborrowercard").val(), { path: "/" });
110
        localStorage.setItem("lastborrowercard", $("#hiddenborrowercard").val() );
120
    }
111
    }
121
    $.cookie("currentborrowernumber", $("#hiddenborrowernumber").val(), { path: "/" });
112
    localStorage.setItem("currentborrowernumber", $("#hiddenborrowernumber").val() );
122
});
113
});
123
114
115
function removeLastBorrower(){
116
    localStorage.removeItem("lastborrowernumber");
117
    localStorage.removeItem("lastborrowername");
118
    localStorage.removeItem("lastborrowercard");
119
    localStorage.removeItem("currentborrowernumber");
120
}
121
124
// http://jennifermadden.com/javascript/stringEnterKeyDetector.html
122
// http://jennifermadden.com/javascript/stringEnterKeyDetector.html
125
function checkEnter(e){ //e is event object passed from function invocation
123
function checkEnter(e){ //e is event object passed from function invocation
126
    var characterCode; // literal character code will be stored in this variable
124
    var characterCode; // literal character code will be stored in this variable
Lines 148-153 function logOut(){ Link Here
148
        delBasket('main', true);
146
        delBasket('main', true);
149
    }
147
    }
150
    clearHoldFor();
148
    clearHoldFor();
149
    removeLastBorrower();
151
}
150
}
152
151
153
function openHelp(){
152
function openHelp(){
154
- 

Return to bug 24625