[Erp5-report] r19998 - /erp5admin/trunk/content/erp5admin/erp5admin_async.js

[nobody at svn.erp5.org]

Author: bartek
Date: Tue Mar 18 17:45:30 2008
New Revision: 19998

URL: http://svn.erp5.org?rev=19998&view=rev
Log:
fix 'stay here' option so that it really works

Modified:
    erp5admin/trunk/content/erp5admin/erp5admin_async.js

Modified: erp5admin/trunk/content/erp5admin/erp5admin_async.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin_async.js?rev=19998&r1=19997&r2=19998&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin_async.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin_async.js Tue Mar 18 17:45:30 2008
@@ -1,3 +1,4 @@
+security_url = false;
 
 function erp5admin_processResponse(http_request, callback, fallback){
     if (http_request.readyState == 4){
@@ -119,10 +120,9 @@
 }
 
 function erp5admin_openSecurity(){
-    site_url = erp5admin_getContextURL();
-    erp5admin_openInDashboard('security', site_url + '/Admin_viewSecurity');
+    context_url = erp5admin_getContextURL();
+    erp5admin_openInDashboard('security', context_url + '/Admin_viewSecurity');
     sec_timeout = window.setTimeout(erp5admin_openSecurity, 3000);
-    // start timed refresh ?
 } 
 
 function erp5admin_getTestScriptName(){
@@ -211,19 +211,13 @@
         browser = dashboard_browse.childNodes[0]
     }
     try {
+        if((security_url == false) || (dashboard.stayhere == false)) security_url = url;
         if(dashboard.hidden){
-            browser.setAttribute("src", url);
+            browser.setAttribute("src", security_url);
             browser.reload()
         }else{
-            if(dashboard.stayhere == true){
-                browser.reload();
-            }else{
-                browser.loadURI(url); 
-            }
+            browser.loadURI(security_url); 
         }
-        // or
-        // browser.setAttribute("src", url);
-        // browser.reload()
     }catch(e){
         // pass
     }
@@ -247,6 +241,7 @@
     dashboard.height = 0;
     dashboard.width = 0;
     document.getElementById("erp5admin-dashboard-splitter").hidden = true;
+    security_url = false;
 }
 
 function erp5admin_toggleStayHere(checkbox){