when clicking on 'cancel' on the login deck on MYOPAC, the user is
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 29 Dec 2005 15:23:24 +0000 (15:23 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 29 Dec 2005 15:23:24 +0000 (15:23 +0000)
now redirected to the home page instead of seeing an empty MYOPAC page

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2545 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/web/opac/common/js/opac_utils.js
Open-ILS/web/opac/skin/default/js/holds.js
Open-ILS/web/opac/skin/default/js/sidebar.js

index e10ae5a..6256d43 100644 (file)
@@ -627,6 +627,7 @@ function checkILSEvent(obj) {
        return null;
 }
 function alertILSEvent(code, msg) {
+   if(!msg) msg = "";
        alert( msg + '\n' + $('ilsevent.' + code).innerHTML );
 }
 
@@ -658,3 +659,10 @@ function grabUserByBarcode( authtoken, barcode ) {
        return req.result();
 }
 
+
+function goHome() {
+       goTo(buildOPACLink({page:HOME}));
+}
+
+
+
index a96c4dd..02165a9 100644 (file)
@@ -38,7 +38,6 @@ function holdsDrawWindow(recid, type) {
        currentHoldRecord = recid;
        
        if(isXUL() && holdRecipient == null ) { 
-       //if(holdRecipient == null ) { 
                holdsHandleStaff();
                return;
        }
index a1be00a..f11aaee 100644 (file)
@@ -72,6 +72,8 @@ function initLogin() {
 
        loginBoxVisible = !loginBoxVisible;
        G.ui.login.cancel.onclick = showCanvas;
+       if(findCurrentPage() == MYOPAC) 
+               G.ui.login.cancel.onclick = goHome;
 }
 
 function setSidebarLinks() {